Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 2bc7ad7..4bd03a2 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -79,6 +79,7 @@ config EXPORTFS_BLOCK_OPS
 config FILE_LOCKING
        bool "Enable POSIX file locking API" if EXPERT
        default y
 config FILE_LOCKING
        bool "Enable POSIX file locking API" if EXPERT
        default y

+       select PERCPU_RWSEM

        help
          This option enables standard file locking support, required
           for filesystems like NFS and for the flock() system
        help
          This option enables standard file locking support, required
           for filesystems like NFS and for the flock() system


@@ -199,6 +200,9 @@ config HUGETLBFS
 config HUGETLB_PAGE
        def_bool HUGETLBFS
 
 config HUGETLB_PAGE
        def_bool HUGETLBFS
 

+config ARCH_HAS_GIGANTIC_PAGE
+       bool
+

 source "fs/configfs/Kconfig"
 source "fs/efivarfs/Kconfig"
 
 source "fs/configfs/Kconfig"
 source "fs/efivarfs/Kconfig"