x86/boot: Fix bootinfo.h to be standalone

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

Posted by Andrew Cooper 11 months, 4 weeks ago

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@3mdeb.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Daniel P. Smith <dpsmith@apertussolutions.com>
CC: Krystian Hebel <krystian.hebel@3mdeb.com>
---
 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 cc6305630683..b9c94b370d57 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>
 

base-commit: 75035c386eeb8bd5dbed1831dbb96a35b31521f6
-- 
2.39.5

Re: [PATCH] x86/boot: Fix bootinfo.h to be standalone

Posted by Daniel P. Smith 11 months, 4 weeks ago

On 11/8/24 09:12, Andrew Cooper wrote:
> 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@3mdeb.com>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Daniel P. Smith <dpsmith@apertussolutions.com>
> CC: Krystian Hebel <krystian.hebel@3mdeb.com>
> ---

Reviewed-by: Daniel P. Smith <dpsmith@apertussolutions.com>

Re: [PATCH] x86/boot: Fix bootinfo.h to be standalone

Posted by Jason Andryuk 11 months, 4 weeks ago

On 2024-11-08 09:12, Andrew Cooper wrote:
> 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@3mdeb.com>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>