diff --git a/[refs] b/[refs]
index fc476efc9652..ccb68b8f5678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac0a3260f37b8616da8d33488ec94b94e6ae5b31
+refs/heads/master: fae85b7c8bcc7de9c0a2698587e20c15beb7d5a6
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
index 85cbfb31e73e..79815306474f 100644
--- a/trunk/kernel/Makefile
+++ b/trunk/kernel/Makefile
@@ -21,7 +21,6 @@ CFLAGS_REMOVE_mutex-debug.o = -pg
 CFLAGS_REMOVE_rtmutex-debug.o = -pg
 CFLAGS_REMOVE_cgroup-debug.o = -pg
 CFLAGS_REMOVE_sched_clock.o = -pg
-CFLAGS_REMOVE_perf_event.o = -pg
 CFLAGS_REMOVE_irq_work.o = -pg
 endif
 
@@ -103,7 +102,9 @@ obj-$(CONFIG_RING_BUFFER) += trace/
 obj-$(CONFIG_TRACEPOINTS) += trace/
 obj-$(CONFIG_SMP) += sched_cpupri.o
 obj-$(CONFIG_IRQ_WORK) += irq_work.o
-obj-$(CONFIG_PERF_EVENTS) += perf_event.o
+
+obj-$(CONFIG_PERF_EVENTS) += events/
+
 obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
 obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
 obj-$(CONFIG_PADATA) += padata.o
diff --git a/trunk/kernel/events/Makefile b/trunk/kernel/events/Makefile
new file mode 100644
index 000000000000..26c00e4570e5
--- /dev/null
+++ b/trunk/kernel/events/Makefile
@@ -0,0 +1,5 @@
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_core.o = -pg
+endif
+
+obj-y += core.o
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/events/core.c
similarity index 100%
rename from trunk/kernel/perf_event.c
rename to trunk/kernel/events/core.c