ARM: dts: Group omap3 CONTROL_DEVCONF1 clocks

[linux-2.6-microblaze.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 84bc1de..29b0167 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -164,7 +164,13 @@ config ARCH_USE_BUILTIN_BSWAP
 
 config KRETPROBES
        def_bool y
-       depends on KPROBES && HAVE_KRETPROBES
+       depends on KPROBES && (HAVE_KRETPROBES || HAVE_RETHOOK)
+
+config KRETPROBE_ON_RETHOOK
+       def_bool y
+       depends on HAVE_RETHOOK
+       depends on KRETPROBES
+       select RETHOOK
 
 config USER_RETURN_NOTIFIER
        bool
@@ -217,9 +223,8 @@ config TRACE_IRQFLAGS_SUPPORT
 #      asm/syscall.h           supplying asm-generic/syscall.h interface
 #      linux/regset.h          user_regset interfaces
 #      CORE_DUMP_USE_REGSET    #define'd in linux/elf.h
-#      TIF_SYSCALL_TRACE       calls tracehook_report_syscall_{entry,exit}
-#      TIF_NOTIFY_RESUME       calls tracehook_notify_resume()
-#      signal delivery         calls tracehook_signal_handler()
+#      TIF_SYSCALL_TRACE       calls ptrace_report_syscall_{entry,exit}
+#      TIF_NOTIFY_RESUME       calls resume_user_mode_work()
 #
 config HAVE_ARCH_TRACEHOOK
        bool