diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 08:15:49 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 08:15:49 +0200 |
commit | 9aa7719e0c6a1580451900e672744752804f8f75 (patch) | |
tree | ba36c5536342db2759d0a1843dffd0c193e26ff0 /arch/s390/Kconfig | |
parent | drivers: sh: resume enabled clocks fix (diff) | |
parent | Linux 3.0-rc3 (diff) | |
download | linux-9aa7719e0c6a1580451900e672744752804f8f75.tar.xz linux-9aa7719e0c6a1580451900e672744752804f8f75.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
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 |