From a24e7d4f8e18a4e20a7dda1fae50fe26d8b36b3e Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Tue, 3 May 2011 15:26:43 +0200 Subject: [PATCH] --- yaml --- r: 245458 b: refs/heads/master c: 48dbb6dc86ca5d1b2224937d774c7ba98bc3a485 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/Makefile | 1 - trunk/kernel/events/Makefile | 3 ++- trunk/kernel/{ => events}/hw_breakpoint.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/kernel/{ => events}/hw_breakpoint.c (100%) diff --git a/[refs] b/[refs] index ccb68b8f5678..9dc9555e22ba 100644 --- 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 index 79815306474f..e9cf19155b46 100644 --- 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 index 26c00e4570e5..1ce23d3d8394 100644 --- 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 b/trunk/kernel/events/hw_breakpoint.c similarity index 100% rename from trunk/kernel/hw_breakpoint.c rename to trunk/kernel/events/hw_breakpoint.c