diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-05 02:18:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-05 03:23:04 -0500 |
| commit | 10971ab269bbf22120edac95fcfa3c873a549bea (patch) | |
| tree | 69f51aa9d24bc66e9d4c2f0e9d586636d1f86404 /arch/x86/Kconfig | |
| parent | 73c8c861dc5bddf1b24c6aeffee2292c96cf8db2 (diff) | |
x86/mm: Further simplify 1 GB kernel linear mappings handling
It's a bit pointless to allow Kconfig configuration for 1GB kernel
mappings, it's already hidden behind a 'default y' and CONFIG_EXPERT.
Remove this complication and simplify the code by renaming
CONFIG_ENABLE_DIRECT_GBPAGES to CONFIG_X86_DIRECT_GBPAGES and
document the DEBUG_PAGE_ALLOC and KMEMCHECK quirks.
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Dexuan Cui <decui@microsoft.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: JBeulich@suse.com
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: julia.lawall@lip6.fr
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4d06e1c8294a..d03847513b6d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1299,22 +1299,14 @@ config ARCH_DMA_ADDR_T_64BIT | |||
| 1299 | def_bool y | 1299 | def_bool y |
| 1300 | depends on X86_64 || HIGHMEM64G | 1300 | depends on X86_64 || HIGHMEM64G |
| 1301 | 1301 | ||
| 1302 | config ENABLE_DIRECT_GBPAGES | 1302 | config X86_DIRECT_GBPAGES |
| 1303 | def_bool y | 1303 | def_bool y |
| 1304 | depends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK | 1304 | depends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK |
| 1305 | 1305 | ---help--- | |
| 1306 | config DIRECT_GBPAGES | 1306 | Certain kernel features effectively disable kernel |
| 1307 | bool "Enable 1GB pages for kernel pagetables" if EXPERT | 1307 | linear 1 GB mappings (even if the CPU otherwise |
| 1308 | default y | 1308 | supports them), so don't confuse the user by printing |
| 1309 | depends on ENABLE_DIRECT_GBPAGES | 1309 | that we have them enabled. |
| 1310 | ---help--- | ||
| 1311 | Enable by default the kernel linear mapping to use 1GB pages on CPUs | ||
| 1312 | that support it. This can improve the kernel's performance a tiny bit | ||
| 1313 | by reducing TLB pressure. If in doubt, say "Y". If you've disabled | ||
| 1314 | option but your platform is capable of handling support for this | ||
| 1315 | you can use the gbpages kernel parameter. Likewise if you've enabled | ||
| 1316 | this but you'd like to force disable this option you can use the | ||
| 1317 | nogbpages kernel parameter. | ||
| 1318 | 1310 | ||
| 1319 | # Common NUMA Features | 1311 | # Common NUMA Features |
| 1320 | config NUMA | 1312 | config NUMA |