Merge branch 'perf/core' into auto-latest

diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge

diff --cc arch/x86/kernel/cpu/Makefile
Simple merge

diff --cc arch/x86/oprofile/nmi_int.c
Simple merge