From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Mar 2024 02:23:16 +0000 (-0700)
Subject: Merge tag 'x86-build-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d69ad12c786f0a4593c48c0658043aa4a5116b09;p=linux.git

Merge tag 'x86-build-2024-03-11' of git://git./linux/kernel/git/tip/tip

Pull x86 build updates from Ingo Molnar:

 - Reduce <asm/bootparam.h> dependencies

 - Simplify <asm/efi.h>

 - Unify *_setup_data definitions into <asm/setup_data.h>

 - Reduce the size of <asm/bootparam.h>

* tag 'x86-build-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Do not include <asm/bootparam.h> in several files
  x86/efi: Implement arch_ima_efi_boot_mode() in source file
  x86/setup: Move internal setup_data structures into setup_data.h
  x86/setup: Move UAPI setup structures into setup_data.h
---

d69ad12c786f0a4593c48c0658043aa4a5116b09
diff --cc arch/x86/kernel/sev-shared.c
index ae79f9505298d,fcc6d834e2c48..a200bd72fadc5
--- a/arch/x86/kernel/sev-shared.c
+++ b/arch/x86/kernel/sev-shared.c
@@@ -9,11 -9,11 +9,13 @@@
   * and is included directly into both code-bases.
   */
  
+ #include <asm/setup_data.h>
+ 
  #ifndef __BOOT_COMPRESSED
 -#define error(v)	pr_err(v)
 -#define has_cpuflag(f)	boot_cpu_has(f)
 +#define error(v)			pr_err(v)
 +#define has_cpuflag(f)			boot_cpu_has(f)
 +#define sev_printk(fmt, ...)		printk(fmt, ##__VA_ARGS__)
 +#define sev_printk_rtl(fmt, ...)	printk_ratelimited(fmt, ##__VA_ARGS__)
  #else
  #undef WARN
  #define WARN(condition, format...) (!!(condition))