Skip to contentSkip to conversation

uprobes: Move to kernel/events/

tip:perf/uprobes tip-bot for Ingo Molnar 1 participant 1 message Feb 22, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw
Commit-ID:  a5f4374a9610fd7286c2164d4e680436727eff71
Gitweb:     http://git.kernel.org/tip/a5f4374a9610fd7286c2164d4e680436727eff71
Author:     Ingo Molnar <[email protected]>
AuthorDate: Wed, 22 Feb 2012 11:01:49 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 22 Feb 2012 11:08:00 +0100

uprobes: Move to kernel/events/

Consolidate the uprobes code under kernel/events/, where the various core kernel event handling routines live.

Cc Srikar Dronamraju <[email protected]>
Cc Jim Keniston <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Anton Arapov <[email protected]>
Cc Ananth N Mavinakayanahalli <[email protected]>
---
 arch/Kconfig                  |    2 +-
 kernel/Makefile               |    1 -
 kernel/events/Makefile        |    3 +++
 kernel/{ => events}/uprobes.c |    0
 4 files changed, 4 insertions(+), 2 deletions(-)
arch/Kconfig +1 -1
index cca5b54..d0e37c9 100644
@@ -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
kernel/Makefile +0 -1
index 8609dd3..2d9de86 100644
@@ -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
 
kernel/events/Makefile +3 -0
index 22d901f..103f5d1 100644
@@ -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
+
kernel/events/uprobes.c renamed from kernel/uprobes.c +0 -0
similarity index 100%
rename from kernel/uprobes.c
rename to kernel/events/uprobes.c