Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa9cbf32 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

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: default avatarBorislav 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: default avatarIngo Molnar <mingo@kernel.org>
parent 93b894b6

arch/x86/Kbuild

+2 −1
Original line number Diff line number Diff line 


obj-y += entry/



obj-$(CONFIG_PERF_EVENTS) += events/



obj-$(CONFIG_KVM) += kvm/



# Xen paravirtualization support

arch/x86/events/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y			+= core.o

arch/x86/kernel/cpu/perf_event.c→arch/x86/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/cpu/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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