Commit-ID: fa9cbf320e996eaa3d219344b6f7013b096cafd9 Gitweb: http://git.kernel.org/tip/fa9cbf320e996eaa3d219344b6f7013b096cafd9 Author: Borislav Petkov <[email protected]> AuthorDate: Mon, 8 Feb 2016 17:09:04 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 9 Feb 2016 10:23:49 +0100
perf/x86: Move perf_event.c ............... => x86/events/core.c Also, keep the churn at minimum by adjusting the include "perf_event.h" when each file gets moved. Signed-off-by: Borislav Petkov <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vince Weaver <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- arch/x86/Kbuild | 3 ++- arch/x86/events/Makefile | 1 + arch/x86/{kernel/cpu/perf_event.c => events/core.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 1538562..eb3abf8 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -1,6 +1,7 @@ - obj-y += entry/ +obj-$(CONFIG_PERF_EVENTS) += events/ + obj-$(CONFIG_KVM) += kvm/ # Xen paravirtualization support diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile new file mode 100644 index 0000000..3fad3ce --- /dev/null +++ b/arch/x86/events/Makefile @@ -0,0 +1 @@ +obj-y += core.o diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/events/core.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event.c rename to arch/x86/events/core.c index 7402c818..90ca601 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/events/core.c @@ -37,7 +37,7 @@ #include <asm/desc.h> #include <asm/ldt.h> -#include "perf_event.h" +#include "../kernel/cpu/perf_event.h" struct x86_pmu x86_pmu __read_mostly; diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 5803130..77000d5 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -30,8 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o -obj-$(CONFIG_PERF_EVENTS) += perf_event.o - ifdef CONFIG_PERF_EVENTS obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd.o perf_event_amd_uncore.o ifdef CONFIG_AMD_IOMMU
