summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-02-22 11:01:49 +0100
committerIngo Molnar <mingo@elte.hu>2012-02-22 11:08:00 +0100
commita5f4374a9610fd7286c2164d4e680436727eff71 (patch)
tree8ccabfd8afe9f58a847ab80b8a6a10eee08009a8
parent7b2d81d48a2d8e37efb6ce7b4d5ef58822b30d89 (diff)
downloadop-kernel-dev-a5f4374a9610fd7286c2164d4e680436727eff71.zip
op-kernel-dev-a5f4374a9610fd7286c2164d4e680436727eff71.tar.gz
uprobes: Move to kernel/events/
Consolidate the uprobes code under kernel/events/, where the various core kernel event handling routines live. Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: Jim Keniston <jkenisto@us.ibm.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Arnaldo Carvalho de Melo <acme@infradead.org> Cc: Anton Arapov <anton@redhat.com> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Link: http://lkml.kernel.org/n/tip-biuyhhwohxgbp2vzbap5yr8o@git.kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/Kconfig2
-rw-r--r--kernel/Makefile1
-rw-r--r--kernel/events/Makefile3
-rw-r--r--kernel/events/uprobes.c (renamed from kernel/uprobes.c)0
4 files changed, 4 insertions, 2 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index cca5b54..d0e37c9 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -67,7 +67,7 @@ config OPTPROBES
config UPROBES
bool "Transparent user-space probes (EXPERIMENTAL)"
- depends on ARCH_SUPPORTS_UPROBES
+ depends on ARCH_SUPPORTS_UPROBES && PERF_EVENTS
default n
help
Uprobes is the user-space counterpart to kprobes: they
diff --git a/kernel/Makefile b/kernel/Makefile
index 8609dd3..2d9de86 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -107,7 +107,6 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
obj-$(CONFIG_PADATA) += padata.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
obj-$(CONFIG_JUMP_LABEL) += jump_label.o
-obj-$(CONFIG_UPROBES) += uprobes.o
$(obj)/configs.o: $(obj)/config_data.h
diff --git a/kernel/events/Makefile b/kernel/events/Makefile
index 22d901f..103f5d1 100644
--- a/kernel/events/Makefile
+++ b/kernel/events/Makefile
@@ -3,4 +3,7 @@ CFLAGS_REMOVE_core.o = -pg
endif
obj-y := core.o ring_buffer.o callchain.o
+
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
+obj-$(CONFIG_UPROBES) += uprobes.o
+
diff --git a/kernel/uprobes.c b/kernel/events/uprobes.c
index 884817f..884817f 100644
--- a/kernel/uprobes.c
+++ b/kernel/events/uprobes.c
OpenPOWER on IntegriCloud