[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] x86/boot: Fix bootinfo.h to be standalone



commit 6c88e35fa196defd56f709e7c596d4bedc071e54
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Nov 8 14:08:33 2024 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Nov 8 20:31:10 2024 +0000

    x86/boot: Fix bootinfo.h to be standalone
    
    Work to rebase the Trenchboot patch series has encountered:
    
      In file included from ./arch/x86/include/asm/tpm.h:4,
                       from arch/x86/boot/../tpm.c:23:
      ./arch/x86/include/asm/bootinfo.h:88:35: error: expected '=', ',', ';', 
'asm' or '__attribute__' before 'next_boot_module_index'
         88 | static inline unsigned int __init next_boot_module_index(
            |
    
    Fix this by including the necessary header.
    
    Fixes: 74af2d98276d ("x86/boot: eliminate module_map")
    Reported-by: Krystian Hebel <krystian.hebel@xxxxxxxxx>
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jason Andryuk <jason.andryuk@xxxxxxx>
    Reviewed-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
---
 xen/arch/x86/include/asm/bootinfo.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xen/arch/x86/include/asm/bootinfo.h 
b/xen/arch/x86/include/asm/bootinfo.h
index cc63056306..b9c94b370d 100644
--- a/xen/arch/x86/include/asm/bootinfo.h
+++ b/xen/arch/x86/include/asm/bootinfo.h
@@ -8,6 +8,7 @@
 #ifndef X86_BOOTINFO_H
 #define X86_BOOTINFO_H
 
+#include <xen/init.h>
 #include <xen/multiboot.h>
 #include <xen/types.h>
 
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.