Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

[linux-2.6-microblaze.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 141a856..a7749c1 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -240,6 +240,21 @@ config HUGETLBFS
 config HUGETLB_PAGE
        def_bool HUGETLBFS
 
+config HUGETLB_PAGE_FREE_VMEMMAP
+       def_bool HUGETLB_PAGE
+       depends on X86_64
+       depends on SPARSEMEM_VMEMMAP
+
+config HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON
+       bool "Default freeing vmemmap pages of HugeTLB to on"
+       default n
+       depends on HUGETLB_PAGE_FREE_VMEMMAP
+       help
+         When using HUGETLB_PAGE_FREE_VMEMMAP, the freeing unused vmemmap
+         pages associated with each HugeTLB page is default off. Say Y here
+         to enable freeing vmemmap pages of HugeTLB by default. It can then
+         be disabled on the command line via hugetlb_free_vmemmap=off.
+
 config MEMFD_CREATE
        def_bool TMPFS || HUGETLBFS