diff options
| author | Borislav Petkov <bp@suse.de> | 2016-02-08 17:09:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-09 10:23:49 +0100 |
| commit | fa9cbf320e996eaa3d219344b6f7013b096cafd9 (patch) | |
| tree | 6025594a17b7c04a858b67969ff2efdb3f660469 /arch | |
| parent | 93b894b6ab829fa640af041de36ced22c714c090 (diff) | |
| download | linux-fa9cbf320e996eaa3d219344b6f7013b096cafd9.tar.gz linux-fa9cbf320e996eaa3d219344b6f7013b096cafd9.tar.bz2 linux-fa9cbf320e996eaa3d219344b6f7013b096cafd9.zip | |
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 <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1454947748-28629-2-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kbuild | 3 | ||||
| -rw-r--r-- | arch/x86/events/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/events/core.c (renamed from arch/x86/kernel/cpu/perf_event.c) | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 1538562cc720..eb3abf8ac44e 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 000000000000..3fad3ce1bbab --- /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 index 7402c8182813..90ca601b5d5c 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 58031303e304..77000d54fcd1 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 |