Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semant...

Conflict-merge this main commit in essence:

  a89dfde3dc3c: ("x86: Remove dynamic NOP selection")

With this upstream commit:

  b90829704780: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")

Semantic merge conflict:

  arch/x86/net/bpf_jit_comp.c

  - memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);
  + memcpy(prog, x86_nops[5], X86_PATCH_SIZE);

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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

diff --cc arch/x86/kernel/alternative.c
Simple merge

diff --cc arch/x86/kernel/kprobes/core.c
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
index b35fc80,6aa29c4..04814dd
--- 1/arch/x86/net/bpf_jit_comp.c
--- 2/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@@ -2011,9 -1999,6 +2011,9 @@@ int arch_prepare_bpf_trampoline(struct 
                }
                /* remember return value in a stack for bpf prog to access */
                emit_stx(&prog, BPF_DW, BPF_REG_FP, BPF_REG_0, -8);
-               memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);
 +              im->ip_after_call = prog;
++              memcpy(prog, x86_nops[5], X86_PATCH_SIZE);
 +              prog += X86_PATCH_SIZE;
        }
  
        if (fmod_ret->nr_progs) {

diff --cc tools/objtool/arch/x86/decode.c
Simple merge

diff --cc tools/objtool/sync-check.sh
Simple merge