diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-08 13:50:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-08 13:50:35 -0700 |
| commit | 7e24cf43f7dcd6312473f01b59be60662232ffce (patch) | |
| tree | d2bf66d51d6d5673b44986456c38b81a95a539f7 /arch/s390/Kconfig | |
| parent | a26d31cef06f43a76327c21235e75450869df2b8 (diff) | |
| parent | 33726bf2140a0e7c9de3ccd7cba6d69962f0b773 (diff) | |
| download | talos-op-linux-7e24cf43f7dcd6312473f01b59be60662232ffce.tar.gz talos-op-linux-7e24cf43f7dcd6312473f01b59be60662232ffce.zip | |
Merge 3.0-rc2 + Linus's latest into usb-linus
This is needed to get the following MAINTAINERS patch to apply properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 9fab2aa9c2c8..90d77bd078f5 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -89,6 +89,7 @@ config S390 select HAVE_GET_USER_PAGES_FAST select HAVE_ARCH_MUTEX_CPU_RELAX select HAVE_ARCH_JUMP_LABEL if !MARCH_G5 + select HAVE_RCU_TABLE_FREE if SMP select ARCH_INLINE_SPIN_TRYLOCK select ARCH_INLINE_SPIN_TRYLOCK_BH select ARCH_INLINE_SPIN_LOCK |
