diff options
| author | William Lee Irwin III <wli@holomorphy.com> | 2007-07-21 17:11:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 18:37:12 -0700 |
| commit | c673f1a9d994de501b674b2bb6a48bd5e912afe0 (patch) | |
| tree | 0657b02b263c24d91f4f6a82c841894bb17bcbb8 /arch/i386/Kconfig | |
| parent | 075bcd1f9726b8a1caff86eda06f29f71fb21235 (diff) | |
| download | linux-stable-c673f1a9d994de501b674b2bb6a48bd5e912afe0.tar.gz linux-stable-c673f1a9d994de501b674b2bb6a48bd5e912afe0.tar.bz2 linux-stable-c673f1a9d994de501b674b2bb6a48bd5e912afe0.zip | |
i386: divorce CONFIG_X86_PAE from CONFIG_HIGHMEM64G
PAE is useful for more than supporting more than 4GB RAM. It supports
expanded swapspace and NX executable protections. Some users may want NX
or expanded swapspace support without the overhead or instability of
highmem. For these reasons, the following patch divorces CONFIG_X86_PAE
from CONFIG_HIGHMEM64G.
Cc: Mark Lord <lkml@rtr.ca>
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/Kconfig')
| -rw-r--r-- | arch/i386/Kconfig | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 361aca8b3ec3..0790bdf8c1f1 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -548,6 +548,7 @@ config HIGHMEM4G config HIGHMEM64G bool "64GB" depends on !M386 && !M486 + select X86_PAE help Select this if you have a 32-bit processor and more than 4 gigabytes of physical RAM. @@ -577,12 +578,12 @@ choice config VMSPLIT_3G bool "3G/1G user/kernel split" config VMSPLIT_3G_OPT - depends on !HIGHMEM + depends on !X86_PAE bool "3G/1G user/kernel split (for full 1G low memory)" config VMSPLIT_2G bool "2G/2G user/kernel split" config VMSPLIT_2G_OPT - depends on !HIGHMEM + depends on !X86_PAE bool "2G/2G user/kernel split (for full 2G low memory)" config VMSPLIT_1G bool "1G/3G user/kernel split" @@ -602,10 +603,15 @@ config HIGHMEM default y config X86_PAE - bool - depends on HIGHMEM64G - default y + bool "PAE (Physical Address Extension) Support" + default n + depends on !HIGHMEM4G select RESOURCES_64BIT + help + PAE is required for NX support, and furthermore enables + larger swapspace support for non-overcommit purposes. It + has the cost of more pagetable lookup overhead, and also + consumes more pagetable space per process. # Common NUMA Features config NUMA |