[PATCH] Make VMSPLIT options less ambiguous

[Simon Arlott <simon@arlott.org>]

[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]

This changes VMSPLIT_2G to really mean 2G, adding VMSPLIT_2G_OPT for the 1920/2176 split. It also prevents either _OPT setting being used when PAE is enabled (http://lkml.org/lkml/2006/12/1/44 - there doesn't appear to be any patches/commits which allow non-1GB boundary VMSPLIT with PAE yet). The existing !HIGHMEM doesn't make sense, VMSPLIT_3G_OPT may be desireable for a kernel built for multiple systems some of which may only have 1GB. This will require anyone using VMSPLIT_2G to change to VMSPLIT_2G_OPT to get the same effect, but the option was badly named when it was added.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>

---

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 0dfee81..e57922b 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -539,10 +539,13 @@ 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 !X86_PAE
+		bool "2G/2G user/kernel split (for full 2G low memory)"
 	config VMSPLIT_1G
 		bool "1G/3G user/kernel split"
 endchoice
@@ -550,7 +553,8 @@ endchoice
 config PAGE_OFFSET
 	hex
 	default 0xB0000000 if VMSPLIT_3G_OPT
-	default 0x78000000 if VMSPLIT_2G
+	default 0x80000000 if VMSPLIT_2G
+	default 0x78000000 if VMSPLIT_2G_OPT
 	default 0x40000000 if VMSPLIT_1G
 	default 0xC0000000
 

-- 
Simon Arlott


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 829 bytes --]