From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 May 2024 01:21:24 +0000 (-0700)
Subject: Merge tag 'x86-cleanups-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c4273a66921219803b70491469c8d248909cd185;p=linux.git

Merge tag 'x86-cleanups-2024-05-13' of git://git./linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:

 - Fix function prototypes to address clang function type cast
   warnings in the math-emu code

 - Reorder definitions in <asm/msr-index.h>

 - Remove unused code

 - Fix typos

 - Simplify #include sections

* tag 'x86-cleanups-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pci/ce4100: Remove unused 'struct sim_reg_op'
  x86/msr: Move ARCH_CAP_XAPIC_DISABLE bit definition to its rightful place
  x86/math-emu: Fix function cast warnings
  x86/extable: Remove unused fixup type EX_TYPE_COPY
  x86/rtc: Remove unused intel-mid.h
  x86/32: Remove unused IA32_STACK_TOP and two externs
  x86/head: Simplify relative include path to xen-head.S
  x86/fred: Fix typo in Kconfig description
  x86/syscall/compat: Remove ia32_unistd.h
  x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR
  x86/virt/tdx: Remove duplicate include
  x86/xen: Remove duplicate #include
---

c4273a66921219803b70491469c8d248909cd185
diff --cc arch/x86/Kconfig
index 9bdb0ba5b8c0a,bf2b2cb65e7fd..40565564a625d
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -501,11 -504,12 +501,11 @@@ config X86_FRE
  	  When enabled, try to use Flexible Return and Event Delivery
  	  instead of the legacy SYSCALL/SYSENTER/IDT architecture for
  	  ring transitions and exception/interrupt handling if the
- 	  system supports.
+ 	  system supports it.
  
 -if X86_32
  config X86_BIGSMP
  	bool "Support for big SMP systems with more than 8 CPUs"
 -	depends on SMP
 +	depends on SMP && X86_32
  	help
  	  This option is needed for the systems that have more than 8 CPUs.
  
diff --cc arch/x86/include/asm/msr-index.h
index e72c2b8729579,961c0eb5aaaf2..e022e6eb766c6
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@@ -166,10 -163,10 +166,14 @@@
  						 * are restricted to targets in
  						 * kernel.
  						 */
 +#define ARCH_CAP_BHI_NO			BIT(20)	/*
 +						 * CPU is not affected by Branch
 +						 * History Injection.
 +						 */
+ #define ARCH_CAP_XAPIC_DISABLE		BIT(21)	/*
+ 						 * IA32_XAPIC_DISABLE_STATUS MSR
+ 						 * supported
+ 						 */
  #define ARCH_CAP_PBRSB_NO		BIT(24)	/*
  						 * Not susceptible to Post-Barrier
  						 * Return Stack Buffer Predictions.