summaryrefslogtreecommitdiffstats
path: root/arch/Kconfig
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 /arch/Kconfig
parent7b2d81d48a2d8e37efb6ce7b4d5ef58822b30d89 (diff)
downloadlinux-stable-a5f4374a9610fd7286c2164d4e680436727eff71.tar.gz
linux-stable-a5f4374a9610fd7286c2164d4e680436727eff71.tar.bz2
linux-stable-a5f4374a9610fd7286c2164d4e680436727eff71.zip
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>
Diffstat (limited to 'arch/Kconfig')
-rw-r--r--arch/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index cca5b545d806..d0e37c9d5f6b 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