[PATCH] i386: stand-alone CONFIG_PAE

["Jan Beulich" <JBeulich@novell.com>]

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

Separate the config option for PAE from that for high memory beyond
4G, allowing configurations with non-execute protection without any
(potential) other overhead coming from HIGHMEM64G.
Also appropriately qualify both options depending on configured
minimum processor type.

From: Jan Beulich <jbeulich@novell.com>

(actual patch attached)


[-- Attachment #2: linux-2.6.14-i386-pae.patch --]
[-- Type: application/octet-stream, Size: 1058 bytes --]

Separate the config option for PAE from that for high memory beyond
4G, allowing configurations with non-execute protection without any
(potential) other overhead coming from HIGHMEM64G.
Also appropriately qualify both options depending on configured
minimum processor type.

From: Jan Beulich <jbeulich@novell.com>

--- 2.6.14/arch/i386/Kconfig	2005-10-28 02:02:08.000000000 +0200
+++ 2.6.14-i386-pae/arch/i386/Kconfig	2005-11-04 16:19:32.000000000 +0100
@@ -739,7 +739,7 @@ config HIGHMEM4G
 	  gigabytes of physical RAM.
 
 config HIGHMEM64G
-	bool "64GB"
+	bool "64GB" if !M386 && !M486 && !M586
 	help
 	  Select this if you have a 32-bit processor and more than 4
 	  gigabytes of physical RAM.
@@ -752,9 +752,11 @@ config HIGHMEM
 	default y
 
 config X86_PAE
-	bool
-	depends on HIGHMEM64G
-	default y
+	bool "PAE" if !HIGHMEM64G && !M386 && !M486 && !M586
+	default HIGHMEM64G
+	help
+	  Select this if you want the no-execute MMU functionality despite
+	  your system not having more than 4 gigabytes of RAM.
 
 # Common NUMA Features
 config NUMA