From 829d12322861827300dcac1b6d604d55ca42e8f1 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 23 Sep 2003 09:43:54 -0700 Subject: [PATCH] [PATCH] make CONFIG_HUGETLB_PAGE mirror CONFIG_HUGETLBFS At present you can set CONFIG_HUGETLB_PAGE and not CONFIG_HUGETLBFS, which give the kernel low-level hugepage support, but no userspace API with which to access it. And with the recent hugetlbfs-accounting fix, the low-level code needs functions which are in hugetlbfs, so CONFIG_HUGETLBFS=n, CONFIG_HUGETLB_PAGE=y doesn't even link. So we flip things around: CONFIG_HUGETLB_PAGE is set if CONFIG_HUGETLBFS is set and CONFIG_HUGETLB_PAGE is unset if CONFIG_HUGETLBFS is unset. The CONFIG_HUGETLB_PAGE option hence disappears from the per-arch configuration menus. --- arch/i386/Kconfig | 11 ----------- arch/ia64/Kconfig | 3 --- arch/ppc64/Kconfig | 11 ----------- arch/sparc64/Kconfig | 10 ---------- arch/x86_64/Kconfig | 8 -------- fs/Kconfig | 4 +++- 6 files changed, 3 insertions(+), 44 deletions(-) diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index f337b2d31815b..75bebed782c2b 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -397,17 +397,6 @@ config X86_OOSTORE depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 default y -config HUGETLB_PAGE - bool "Huge TLB Page Support" - help - This enables support for huge pages. User space applications - can make use of this support with the sys_alloc_hugepages and - sys_free_hugepages system calls. If your applications are - huge page aware and your processor (Pentium or later for x86) - supports this, then say Y here. - - Otherwise, say N. - config HPET_TIMER bool "HPET Timer Support" help diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index ffef70740670e..2c432cea4f7d4 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -304,9 +304,6 @@ config FORCE_MAX_ZONEORDER int default "18" -config HUGETLB_PAGE - bool "IA-64 Huge TLB Page Support" - choice prompt "IA-64 Huge TLB Page Size" depends on HUGETLB_PAGE diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index 4c55da0a0a86f..1405bf41ed014 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig @@ -72,17 +72,6 @@ config PPC64 bool default y -config HUGETLB_PAGE - bool "Huge TLB Page Support" - help - This enables support for huge pages. User space applications - can make use of this support with the sys_alloc_hugepages and - sys_free_hugepages system calls. If your applications are - huge page aware and your processor supports this (only POWER4, - then say Y here. - - Otherwise, say N. - config SMP bool "Symmetric multi-processing support" ---help--- diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 5ed780f7f9f7d..bcafb03c3fce3 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -85,16 +85,6 @@ config HW_CONSOLE bool default y -config HUGETLB_PAGE - bool "SPARC64 Huge TLB Page Support" - help - This enables support for huge pages. User space applications - can make use of this support with the sys_alloc_hugepages and - sys_free_hugepages system calls. If your applications are - huge page aware, then say Y here. - - Otherwise, say N. - config SMP bool "Symmetric multi-processing support" ---help--- diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index a719570b81df7..02f9dbd21394e 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -171,14 +171,6 @@ config MTRR See for more information. -config HUGETLB_PAGE - bool "Huge TLB Page Support" - help - This enables support for huge pages. User space applications - can make use of this support with the hugetlbfs file system - To actually use it you need to pass an hugepages= argument - to the kernel at boot time. - config SMP bool "Symmetric multi-processing support" ---help--- diff --git a/fs/Kconfig b/fs/Kconfig index a49ef60870773..63ec317c1ee0a 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -875,7 +875,9 @@ config TMPFS config HUGETLBFS bool "HugeTLB file system support" - depends on HUGETLB_PAGE + +config HUGETLB_PAGE + def_bool HUGETLBFS config RAMFS bool -- 2.53.0