-
Arnaldo Carvalho de Melo authored
To pick the changes from: 2b129932 ("x86/speculation: Add RSB VM Exit protections") 28a99e95 ("x86/amd: Use IBPB for firmware calls") 4ad3278d ("x86/speculation: Disable RRSBA behavior") 26aae8cc ("x86/cpu/amd: Enumerate BTC_NO") 9756bba2 ("x86/speculation: Fill RSB on vmexit for IBRS") 3ebc1700 ("x86/bugs: Add retbleed=ibpb") 2dbb887e ("x86/entry: Add kernel IBRS implementation") 6b80b59b ("x86/bugs: Report AMD retbleed vulnerability") a149180f ("x86: Add magic AMD return-thunk") 15e67227 ("x86: Undo return-thunk damage") a883d624 ("x86/cpufeatures: Move RETPOLINE flags to word 11") aae99a7c ("x86/cpufeatures: Introduce x2AVIC CPUID bit") 6f33a9da ("x86: Fix comment for X86_FEATURE_ZEN") 51802186 ("x86/speculation/mmio: Enumerate Processor MMIO Stale Data bug") This only causes these perf files to be rebuilt: CC /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o CC /tmp/build/perf/bench/mem-memset-x86-64-asm.o And addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexandre Chartre <alexandre.chartre@oracle.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: Borislav Petkov <bp@suse.de> Cc: Daniel Sneddon <daniel.sneddon@linux.intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Josh Poimboeuf <jpoimboe@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Cc: Wyes Karny <wyes.karny@amd.com> Link: https://lore.kernel.org/lkml/Yvznmu5oHv0ZDN2w@kernel.orgSigned-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
62ed93d1