[PATCH] disable highpte in rmap kernels

Can we please disable highpte in config until it gets fixed?

Patch from Martin Bligh.

diff --git a/arch/i386/config.in b/arch/i386/config.in
index 497404ef3ab152488da4e251b9ae7d4875285fbf..d1c2388136045f7da4bf9c07738f7d6d80eb3517 100644 (file)
--- a/arch/i386/config.in
+++ b/arch/i386/config.in
@@ -185,10 +185,6 @@ choice 'High Memory Support' \
         4GB           CONFIG_HIGHMEM4G \
         64GB          CONFIG_HIGHMEM64G" off
 
-if [ "$CONFIG_HIGHMEM4G" = "y" -o "$CONFIG_HIGHMEM64G" = "y" ]; then
-   bool 'Use high memory pte support' CONFIG_HIGHPTE
-fi
-
 if [ "$CONFIG_HIGHMEM4G" = "y" ]; then
    define_bool CONFIG_HIGHMEM y
 fi

diff --git a/arch/ppc/config.in b/arch/ppc/config.in
index 47d44bbd3fc2b4074f59976b980bc0727ea860b9..071430604929779042ffd3071c857a7d20155973 100644 (file)
--- a/arch/ppc/config.in
+++ b/arch/ppc/config.in
@@ -263,7 +263,6 @@ mainmenu_option next_comment
 comment 'General setup'
 
 bool 'High memory support' CONFIG_HIGHMEM
-dep_bool '  Support for PTEs in high memory' CONFIG_HIGHPTE $CONFIG_HIGHMEM
 bool 'Prompt for advanced kernel configuration options' CONFIG_ADVANCED_OPTIONS
 if [ "$CONFIG_ADVANCED_OPTIONS" = "y" ]; then
    if [ "$CONFIG_HIGHMEM" = "y" ]; then