Commit f2699491 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc/perf: Move perf core & PMU code into a subdirectory 



The perf code has grown a lot since it started, and is big enough to
warrant its own subdirectory. For reference it's ~60% bigger than the
oprofile code. It declutters the kernel directory, makes it simpler to
grep for "just perf stuff", and allows us to shorten some filenames.

While we're at it, make it more obvious that we have two implementations
of the core perf logic. One for (roughly) Book3S CPUs, which was the
original implementation, and the other for Freescale embedded CPUs.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 12d92992

arch/powerpc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ core-y += arch/powerpc/kernel/ \ 
				   arch/powerpc/net/

core-$(CONFIG_XMON)		+= arch/powerpc/xmon/

core-$(CONFIG_KVM) 		+= arch/powerpc/kvm/

core-$(CONFIG_PERF_EVENTS)	+= arch/powerpc/perf/



drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/

arch/powerpc/kernel/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -114,15 +114,6 @@ obj-$(CONFIG_PPC_IO_WORKAROUNDS) += io-workarounds.o 
obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o

obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o

obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o



obj-$(CONFIG_PPC_PERF_CTRS)	+= perf_event.o

obj64-$(CONFIG_PPC_PERF_CTRS)	+= power4-pmu.o ppc970-pmu.o power5-pmu.o \

				   power5+-pmu.o power6-pmu.o power7-pmu.o

obj32-$(CONFIG_PPC_PERF_CTRS)	+= mpc7450-pmu.o



obj-$(CONFIG_FSL_EMB_PERF_EVENT) += perf_event_fsl_emb.o

obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o



obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o

arch/powerpc/perf/Makefile

0 → 100644
+14 −0
Original line number Diff line number Diff line 
subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror



obj-$(CONFIG_PERF_EVENTS)	+= callchain.o



obj-$(CONFIG_PPC_PERF_CTRS)	+= core-book3s.o

obj64-$(CONFIG_PPC_PERF_CTRS)	+= power4-pmu.o ppc970-pmu.o power5-pmu.o \

				   power5+-pmu.o power6-pmu.o power7-pmu.o

obj32-$(CONFIG_PPC_PERF_CTRS)	+= mpc7450-pmu.o



obj-$(CONFIG_FSL_EMB_PERF_EVENT) += core-fsl-emb.o

obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o



obj-$(CONFIG_PPC64)		+= $(obj64-y)

obj-$(CONFIG_PPC32)		+= $(obj32-y)

arch/powerpc/kernel/perf_callchain.c→arch/powerpc/perf/callchain.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/ucontext.h>

#include <asm/vdso.h>

#ifdef CONFIG_PPC64

#include "ppc32.h"

#include "../kernel/ppc32.h"

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE