summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2011-05-03 15:26:43 +0200
committerBorislav Petkov <borislav.petkov@amd.com>2011-05-03 15:26:43 +0200
commit48dbb6dc86ca5d1b2224937d774c7ba98bc3a485 (patch)
tree7c1aaae9ebb6554b0ef2a48aeab158c1a0466655
parentfae85b7c8bcc7de9c0a2698587e20c15beb7d5a6 (diff)
downloadlinux-48dbb6dc86ca5d1b2224937d774c7ba98bc3a485.tar.bz2
hw breakpoints: Move to kernel/events/
As part of the events sybsystem unification, relocate hw_breakpoint.c into its new destination. Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
-rw-r--r--kernel/Makefile1
-rw-r--r--kernel/events/Makefile3
-rw-r--r--kernel/events/hw_breakpoint.c (renamed from kernel/hw_breakpoint.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 79815306474f..e9cf19155b46 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -105,7 +105,6 @@ obj-$(CONFIG_IRQ_WORK) += irq_work.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
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
diff --git a/kernel/events/Makefile b/kernel/events/Makefile
index 26c00e4570e5..1ce23d3d8394 100644
--- a/kernel/events/Makefile
+++ b/kernel/events/Makefile
@@ -2,4 +2,5 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_core.o = -pg
endif
-obj-y += core.o
+obj-y := core.o
+obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
diff --git a/kernel/hw_breakpoint.c b/kernel/events/hw_breakpoint.c
index 086adf25a55e..086adf25a55e 100644
--- a/kernel/hw_breakpoint.c
+++ b/kernel/events/hw_breakpoint.c