summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 22:22:49 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 22:22:49 +0100
commit1bbc9a66d0194449f32c2aa18be40db5744dbd85 (patch)
tree05c2efbd2cc8058ca1318fea2875880150b69d54 /fs
parentx86: Make sure get_user_desc() doesn't sign extend. (diff)
parentpowerpc/kvm: Remove problematic BUILD_BUG_ON statement (diff)
downloadlinux-1bbc9a66d0194449f32c2aa18be40db5744dbd85.tar.xz
linux-1bbc9a66d0194449f32c2aa18be40db5744dbd85.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/kvm: Remove problematic BUILD_BUG_ON statement powerpc/pci: Fix regression in powerpc MSI-X powerpc: Avoid giving out RTC dates below EPOCH powerpc/mm: Remove debug context clamping from nohash code powerpc: Cleanup Kconfig selection of hugetlbfs support
Diffstat (limited to 'fs')
-rw-r--r--fs/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 2126078a38ed..64d44efad7a5 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL
config HUGETLBFS
bool "HugeTLB file system support"
- depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \
+ depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
SYS_SUPPORTS_HUGETLBFS || BROKEN
help
hugetlbfs is a filesystem backing for HugeTLB pages, based on