Skip to content

Commit fa9cbf3

Browse files
suryasaimadhuIngo Molnar
authored andcommitted
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]>
1 parent 93b894b commit fa9cbf3

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

arch/x86/Kbuild

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
21
obj-y += entry/
32

3+
obj-$(CONFIG_PERF_EVENTS) += events/
4+
45
obj-$(CONFIG_KVM) += kvm/
56

67
# Xen paravirtualization support

arch/x86/events/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
obj-y += core.o

arch/x86/kernel/cpu/perf_event.c renamed to arch/x86/events/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <asm/desc.h>
3838
#include <asm/ldt.h>
3939

40-
#include "perf_event.h"
40+
#include "../kernel/cpu/perf_event.h"
4141

4242
struct x86_pmu x86_pmu __read_mostly;
4343

arch/x86/kernel/cpu/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
3030
obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
3131
obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
3232

33-
obj-$(CONFIG_PERF_EVENTS) += perf_event.o
34-
3533
ifdef CONFIG_PERF_EVENTS
3634
obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd.o perf_event_amd_uncore.o
3735
ifdef CONFIG_AMD_IOMMU

0 commit comments

Comments
 (0)