arch/x86/Makefile | 1 - arch/x86/entry/common.c | 15 +++- arch/x86/entry/syscall_32.c | 11 +-- arch/x86/entry/syscall_64.c | 6 -- arch/x86/entry/syscall_x32.c | 7 +- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/disabled-features.h | 3 +- arch/x86/include/asm/nospec-branch.h | 18 +--- arch/x86/include/asm/syscall.h | 8 +- arch/x86/kernel/alternative.c | 17 +--- arch/x86/kernel/cpu/bugs.c | 88 +++++++------------ arch/x86/kernel/cpu/cpu.h | 3 +- arch/x86/lib/retpoline.S | 5 +- arch/x86/net/bpf_jit_comp.c | 5 +- tools/arch/x86/include/asm/cpufeatures.h | 1 - .../arch/x86/include/asm/disabled-features.h | 3 +- 16 files changed, 69 insertions(+), 124 deletions(-)