diff --git a/[refs] b/[refs] index cc4deae8757f..2991759d2a08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6aa3001b239b387d98a7f945e4a51edeb59e4f2d +refs/heads/master: dda27d1a55e185b0c5fd184b86ac26c66846f095 diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig index 2524629dc835..f9b5842c8d2d 100644 --- a/trunk/fs/Kconfig +++ b/trunk/fs/Kconfig @@ -842,6 +842,12 @@ config TMPFS config HUGETLBFS bool "HugeTLB file system support" depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN + help + hugetlbfs is a filesystem backing for HugeTLB pages, based on + ramfs. For architectures that support it, say Y here and read + for details. + + If unsure, say N. config HUGETLB_PAGE def_bool HUGETLBFS