Merge tag 'x86_cpu_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 CPU feature updates from Borislav Petkov:

 - Remove a bunch of chicken bit options to turn off CPU features which
   are not really needed anymore

 - Misc fixes and cleanups

* tag 'x86_cpu_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/speculation: Add missing prototype for unpriv_ebpf_notify()
  x86/pm: Fix false positive kmemleak report in msr_build_context()
  x86/speculation/srbds: Do not try to turn mitigation off when not supported
  x86/cpu: Remove "noclflush"
  x86/cpu: Remove "noexec"
  x86/cpu: Remove "nosmep"
  x86/cpu: Remove CONFIG_X86_SMAP and "nosmap"
  x86/cpu: Remove "nosep"
  x86/cpu: Allow feature bit names from /proc/cpuinfo in clearcpuid=

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/x86/x86_64/boot-options.rst
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/disabled-features.h
index b37de82,1ae0fab..36369e7
--- 1/arch/x86/include/asm/disabled-features.h
--- 2/arch/x86/include/asm/disabled-features.h
+++ b/arch/x86/include/asm/disabled-features.h
@@@ -85,8 -73,8 +79,8 @@@
  #define DISABLED_MASK5        0
  #define DISABLED_MASK6        0
  #define DISABLED_MASK7        (DISABLE_PTI)
 -#define DISABLED_MASK8        0
 +#define DISABLED_MASK8        (DISABLE_TDX_GUEST)
- #define DISABLED_MASK9        (DISABLE_SMAP|DISABLE_SGX)
+ #define DISABLED_MASK9        (DISABLE_SGX)
  #define DISABLED_MASK10       0
  #define DISABLED_MASK11       0
  #define DISABLED_MASK12       0

diff --cc arch/x86/include/asm/proto.h
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
index f0baf1b,7dd7604..2e91427
--- 1/arch/x86/kernel/cpu/common.c
--- 2/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -1856,18 -1868,8 +1869,10 @@@ void identify_secondary_cpu(struct cpui
        validate_apic_and_package_id(c);
        x86_spec_ctrl_setup_ap();
        update_srbds_msr();
 +
 +      tsx_ap_init();
  }
  
- static __init int setup_noclflush(char *arg)
- {
-       setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);
-       setup_clear_cpu_cap(X86_FEATURE_CLFLUSHOPT);
-       return 1;
- }
- __setup("noclflush", setup_noclflush);
- 
  void print_cpu_info(struct cpuinfo_x86 *c)
  {
        const char *vendor = NULL;

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc scripts/Makefile.build
index 33c1ed5,7e7aa1d..3911bfc
--- 1/scripts/Makefile.build
--- 2/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@@ -231,9 -231,9 +231,9 @@@ objtool_args =                                                             
        $(if $(part-of-module), --module)                               \
        $(if $(CONFIG_X86_KERNEL_IBT), --lto --ibt)                     \
        $(if $(CONFIG_FRAME_POINTER),, --no-fp)                         \
 -      $(if $(CONFIG_GCOV_KERNEL)$(CONFIG_LTO_CLANG), --no-unreachable)\
 +      $(if $(CONFIG_GCOV_KERNEL), --no-unreachable)                   \
        $(if $(CONFIG_RETPOLINE), --retpoline)                          \
-       $(if $(CONFIG_X86_SMAP), --uaccess)                             \
+       --uaccess                                                       \
        $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount)             \
        $(if $(CONFIG_SLS), --sls)
  

diff --cc scripts/link-vmlinux.sh
Simple merge