---

yaml --- r: 245458 b: refs/heads/master c: 48dbb6d h: refs/heads/master v: v3
git-mirror · May 3, 2011 · a24e7d4 · a24e7d4
1 parent 23cd449
commit a24e7d4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fae85b7c8bcc7de9c0a2698587e20c15beb7d5a6
+refs/heads/master: 48dbb6dc86ca5d1b2224937d774c7ba98bc3a485
diff --git a/trunk/kernel/Makefile b/trunk/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/trunk/kernel/events/Makefile b/trunk/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/trunk/kernel/hw_breakpoint.c → trunk/kernel/events/hw_breakpoint.c b/trunk/kernel/hw_breakpoint.c → trunk/kernel/events/hw_breakpoint.c