summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2010-10-26 18:24:03 (GMT)
committerBorislav Petkov <borislav.petkov@amd.com>2011-05-03 10:59:43 (GMT)
commitfae85b7c8bcc7de9c0a2698587e20c15beb7d5a6 (patch)
tree96ea37ea08d52b2ef89f823f6e43ba8b15cc66bb /kernel
parentac0a3260f37b8616da8d33488ec94b94e6ae5b31 (diff)
downloadlinux-fae85b7c8bcc7de9c0a2698587e20c15beb7d5a6.tar.xz
perf: Start the restructuring
mv kernel/perf_event.c -> kernel/events/core.c. From there, all further sensible splitting can happen. The idea is that due to perf_event.c becoming pretty sizable and with the advent of the marriage with ftrace, splitting functionality into its logical parts should help speeding up the unification and to manage the complexity of the subsystem. Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile5
-rw-r--r--kernel/events/Makefile5
-rw-r--r--kernel/events/core.c (renamed from kernel/perf_event.c)0
3 files changed, 8 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 85cbfb3..7981530 100644
--- a/kernel/Makefile
+++ b/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/kernel/events/Makefile b/kernel/events/Makefile
new file mode 100644
index 0000000..26c00e4
--- /dev/null
+++ b/kernel/events/Makefile
@@ -0,0 +1,5 @@
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_core.o = -pg
+endif
+
+obj-y += core.o
diff --git a/kernel/perf_event.c b/kernel/events/core.c
index 440bc48..440bc48 100644
--- a/kernel/perf_event.c
+++ b/kernel/events/core.c