diff options
author | Avi Kivity <avi@redhat.com> | 2009-12-03 09:30:06 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-12-03 09:30:06 +0200 |
commit | 58988b07cfe2ebe9f9b39d973fd8a083390e749f (patch) | |
tree | f7a164abe85b8aa768c58a80c1261208372fb4b0 /arch/Kconfig | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
parent | 8e7cac79808b62f242069a6ac88d364d35621371 (diff) | |
download | kernel_samsung_smdk4412-58988b07cfe2ebe9f9b39d973fd8a083390e749f.zip kernel_samsung_smdk4412-58988b07cfe2ebe9f9b39d973fd8a083390e749f.tar.gz kernel_samsung_smdk4412-58988b07cfe2ebe9f9b39d973fd8a083390e749f.tar.bz2 |
Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/Kconfig')
-rw-r--r-- | arch/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 7f418bb..4e312ff 100644 --- 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 @@ -126,4 +133,7 @@ config HAVE_DMA_API_DEBUG config HAVE_DEFAULT_NO_SPIN_MUTEXES bool +config HAVE_USER_RETURN_NOTIFIER + bool + source "kernel/gcov/Kconfig" |