---

yaml --- r: 292475 b: refs/heads/master c: f269949 h: refs/heads/master i: 292473: 3d65796 292471: f1eaf2d v: v3
git-mirror · Feb 22, 2012 · 7a72b4b · 7a72b4b
1 parent 3021773
commit 7a72b4b
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d9299241241200e4f34f3b02f206fa8384a923
+refs/heads/master: f2699491e06584a2ebb0939f108ad29f3b151456
diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile
@@ -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/
 

diff --git a/trunk/arch/powerpc/kernel/Makefile b/trunk/arch/powerpc/kernel/Makefile
@@ -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
 

diff --git a/trunk/arch/powerpc/perf/Makefile b/trunk/arch/powerpc/perf/Makefile
@@ -0,0 +1,14 @@
+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)
diff --git a/trunk/arch/powerpc/kernel/perf_callchain.c → trunk/arch/powerpc/perf/callchain.c b/trunk/arch/powerpc/kernel/perf_callchain.c → trunk/arch/powerpc/perf/callchain.c
@@ -20,7 +20,7 @@
 #include <asm/ucontext.h>
 #include <asm/vdso.h>
 #ifdef CONFIG_PPC64
-#include "ppc32.h"
+#include "../kernel/ppc32.h"
 #endif
 
 

diff --git a/trunk/arch/powerpc/kernel/perf_event.c → trunk/arch/powerpc/perf/core-book3s.c b/trunk/arch/powerpc/kernel/perf_event.c → trunk/arch/powerpc/perf/core-book3s.c
diff --git a/.../arch/powerpc/kernel/perf_event_fsl_emb.c → trunk/arch/powerpc/perf/core-fsl-emb.c b/.../arch/powerpc/kernel/perf_event_fsl_emb.c → trunk/arch/powerpc/perf/core-fsl-emb.c
diff --git a/trunk/arch/powerpc/kernel/e500-pmu.c → trunk/arch/powerpc/perf/e500-pmu.c b/trunk/arch/powerpc/kernel/e500-pmu.c → trunk/arch/powerpc/perf/e500-pmu.c
diff --git a/trunk/arch/powerpc/kernel/mpc7450-pmu.c → trunk/arch/powerpc/perf/mpc7450-pmu.c b/trunk/arch/powerpc/kernel/mpc7450-pmu.c → trunk/arch/powerpc/perf/mpc7450-pmu.c
diff --git a/trunk/arch/powerpc/kernel/power4-pmu.c → trunk/arch/powerpc/perf/power4-pmu.c b/trunk/arch/powerpc/kernel/power4-pmu.c → trunk/arch/powerpc/perf/power4-pmu.c
diff --git a/trunk/arch/powerpc/kernel/power5+-pmu.c → trunk/arch/powerpc/perf/power5+-pmu.c b/trunk/arch/powerpc/kernel/power5+-pmu.c → trunk/arch/powerpc/perf/power5+-pmu.c
diff --git a/trunk/arch/powerpc/kernel/power5-pmu.c → trunk/arch/powerpc/perf/power5-pmu.c b/trunk/arch/powerpc/kernel/power5-pmu.c → trunk/arch/powerpc/perf/power5-pmu.c
diff --git a/trunk/arch/powerpc/kernel/power6-pmu.c → trunk/arch/powerpc/perf/power6-pmu.c b/trunk/arch/powerpc/kernel/power6-pmu.c → trunk/arch/powerpc/perf/power6-pmu.c
@@ -131,7 +131,7 @@ static u32 marked_bus_events[16] = {
 	0x00000022,	/* BFP set 2: byte 0 bits 1, 5 */
 	0, 0
 };
-	
+
 /*
  * Returns 1 if event counts things relating to marked instructions
  * and thus needs the MMCRA_SAMPLE_ENABLE bit set, or 0 if not.

diff --git a/trunk/arch/powerpc/kernel/power7-pmu.c → trunk/arch/powerpc/perf/power7-pmu.c b/trunk/arch/powerpc/kernel/power7-pmu.c → trunk/arch/powerpc/perf/power7-pmu.c
diff --git a/trunk/arch/powerpc/kernel/ppc970-pmu.c → trunk/arch/powerpc/perf/ppc970-pmu.c b/trunk/arch/powerpc/kernel/ppc970-pmu.c → trunk/arch/powerpc/perf/ppc970-pmu.c
@@ -252,7 +252,7 @@ static int p970_get_alternatives(u64 event, unsigned int flags, u64 alt[])
 		alt[1] = event ^ 0x1000;
 		return 2;
 	}
-		
+
 	return 1;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,7 +131,7 @@ static u32 marked_bus_events[16] = { @@
 x00000022,	/* BFP set 2: byte 0 bits 1, 5 */
 , 0
     };
     /*
      * Returns 1 if event counts things relating to marked instructions
      * and thus needs the MMCRA_SAMPLE_ENABLE bit set, or 0 if not.
@@ Expand Down @@