aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-13 16:31:32 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-13 16:31:32 -0400
commit6cf78d4b3766bcd25348d72377796f9566ac8e1a (patch)
treed1c9465df24187637e456fcb4d5a47342b5fd9f6 /arch/x86/Kconfig
parent0ad5c6b3c2d1183740d225944059b0fdedb2afba (diff)
parent4e26d11f52684dc8b1632a8cfe450cb5197a8464 (diff)
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm changes from Ingo Molnar: "The main changes in this cycle were: - reduce the x86/32 PAE per task PGD allocation overhead from 4K to 0.032k (Fenghua Yu) - early_ioremap/memunmap() usage cleanups (Juergen Gross) - gbpages support cleanups (Luis R Rodriguez) - improve AMD Bulldozer (family 0x15) ASLR I$ aliasing workaround to increase randomization by 3 bits (per bootup) (Hector Marco-Gisbert) - misc fixlets" * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm: Improve AMD Bulldozer ASLR workaround x86/mm/pat: Initialize __cachemode2pte_tbl[] and __pte2cachemode_tbl[] in a bit more readable fashion init.h: Clean up the __setup()/early_param() macros x86/mm: Simplify probe_page_size_mask() x86/mm: Further simplify 1 GB kernel linear mappings handling x86/mm: Use early_param_on_off() for direct_gbpages init.h: Add early_param_on_off() x86/mm: Simplify enabling direct_gbpages x86/mm: Use IS_ENABLED() for direct_gbpages x86/mm: Unexport set_memory_ro() and set_memory_rw() x86/mm, efi: Use early_ioremap() in arch/x86/platform/efi/efi-bgrt.c x86/mm: Use early_memunmap() instead of early_iounmap() x86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases x86/mm: Reduce PAE-mode per task pgd allocation overhead from 4K to 32 bytes
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 867bc5bea8dc..faff6934c05a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1295,14 +1295,14 @@ config ARCH_DMA_ADDR_T_64BIT
1295 def_bool y 1295 def_bool y
1296 depends on X86_64 || HIGHMEM64G 1296 depends on X86_64 || HIGHMEM64G
1297 1297
1298config DIRECT_GBPAGES 1298config X86_DIRECT_GBPAGES
1299 bool "Enable 1GB pages for kernel pagetables" if EXPERT 1299 def_bool y
1300 default y 1300 depends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK
1301 depends on X86_64
1302 ---help--- 1301 ---help---
1303 Allow the kernel linear mapping to use 1GB pages on CPUs that 1302 Certain kernel features effectively disable kernel
1304 support it. This can improve the kernel's performance a tiny bit by 1303 linear 1 GB mappings (even if the CPU otherwise
1305 reducing TLB pressure. If in doubt, say "Y". 1304 supports them), so don't confuse the user by printing
1305 that we have them enabled.
1306 1306
1307# Common NUMA Features 1307# Common NUMA Features
1308config NUMA 1308config NUMA