---

yaml --- r: 360663 b: refs/heads/master c: 903b20a h: refs/heads/master i: 360661: a3da5d8 360659: 8300ed7 360655: 598b75a v: v3
git-mirror · Mar 2, 2013 · 160636a · 160636a
1 parent bcd3493
commit 160636a
Show file tree

Hide file tree

Showing 8 changed files with 1,074 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5633004cc2498ff50a5b88d415d3746ff0c301f2
+refs/heads/master: 903b20ad6810e05bc5f7cc038257e80463e71001
diff --git a/trunk/arch/metag/Kconfig b/trunk/arch/metag/Kconfig
@@ -22,6 +22,7 @@ config METAG
 	select HAVE_MEMBLOCK
 	select HAVE_MEMBLOCK_NODE_MAP
 	select HAVE_MOD_ARCH_SPECIFIC
+	select HAVE_PERF_EVENTS
 	select HAVE_SYSCALL_TRACEPOINTS
 	select IRQ_DOMAIN
 	select MODULES_USE_ELF_RELA

diff --git a/trunk/arch/metag/include/asm/perf_event.h b/trunk/arch/metag/include/asm/perf_event.h
@@ -0,0 +1,4 @@
+#ifndef __ASM_METAG_PERF_EVENT_H
+#define __ASM_METAG_PERF_EVENT_H
+
+#endif /* __ASM_METAG_PERF_EVENT_H */
diff --git a/trunk/arch/metag/kernel/Makefile b/trunk/arch/metag/kernel/Makefile
@@ -25,6 +25,8 @@ obj-y	+= topology.o
 obj-y	+= traps.o
 obj-y	+= user_gateway.o
 
+obj-$(CONFIG_PERF_EVENTS)		+= perf/
+
 obj-$(CONFIG_METAG_COREMEM)		+= coremem.o
 obj-$(CONFIG_DYNAMIC_FTRACE)		+= ftrace.o
 obj-$(CONFIG_FUNCTION_TRACER)		+= ftrace_stub.o

diff --git a/trunk/arch/metag/kernel/perf/Makefile b/trunk/arch/metag/kernel/perf/Makefile
@@ -0,0 +1,3 @@
+# Makefile for performance event core
+
+obj-y += perf_event.o
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Makefile for performance event core

		obj-y += perf_event.o