Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[safe/jmp/linux-2.6] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index eef3bbb..d828758 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -83,6 +83,13 @@ config KRETPROBES
        def_bool y
        depends on KPROBES && HAVE_KRETPROBES
 
+config USER_RETURN_NOTIFIER
+       bool
+       depends on HAVE_USER_RETURN_NOTIFIER
+       help
+         Provide a kernel-internal notification when a cpu is about to
+         switch to user mode.
+
 config HAVE_IOREMAP_PROT
        bool
 
@@ -132,5 +139,7 @@ config HAVE_HW_BREAKPOINT
        select ANON_INODES
        select PERF_EVENTS
 
+config HAVE_USER_RETURN_NOTIFIER
+       bool
 
 source "kernel/gcov/Kconfig"