Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33

[net-next-2.6.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 72ace9515a07a44525778899e1ea04b32b3accbc..8b54096e6d7347c48dfd8a2cf56babcccc0fb11c 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -50,6 +50,7 @@ config X86
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_LZMA
        select HAVE_ARCH_KMEMCHECK
+       select HAVE_USER_RETURN_NOTIFIER
 
 config OUTPUT_FORMAT
        string