diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-24 03:01:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-24 03:01:31 +0200 |
| commit | c5a3d3c01e90e74166f95eec9db6fcc3ba72a9d6 (patch) | |
| tree | 3f938013952aaf28beab3e6228a4c4e5aa90badf /arch/x86/include/asm/proto.h | |
| parent | Merge tag 'x86_tdx_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | x86/speculation: Add missing prototype for unpriv_ebpf_notify() (diff) | |
| download | linux-c5a3d3c01e90e74166f95eec9db6fcc3ba72a9d6.tar.xz linux-c5a3d3c01e90e74166f95eec9db6fcc3ba72a9d6.zip | |
Merge tag 'x86_cpu_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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=
Diffstat (limited to 'arch/x86/include/asm/proto.h')
| -rw-r--r-- | arch/x86/include/asm/proto.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index f042cfc9938f..647d71535ce3 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -39,7 +39,6 @@ void xen_entry_INT80_compat(void); #endif void x86_configure_nx(void); -void x86_report_nx(void); extern int reboot_force; |