[PATCH] ix86: minor highmem related Kconfig cleanup

[PATCH] ix86: minor highmem related Kconfig cleanup

[Jan Beulich]

Remove a redundant conditional and consolidate a dependency.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

---
 arch/x86/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.31-rc1/arch/x86/Kconfig	2009-06-26 17:49:41.000000000 +0200
+++ 2.6.31-rc1-x86-kconfig-cleanup/arch/x86/Kconfig	2009-06-23 14:07:12.000000000 +0200
@@ -1001,8 +1001,8 @@ config X86_CPU_DEBUG
 
 choice
 	prompt "High Memory Support"
-	default HIGHMEM4G if !X86_NUMAQ
 	default HIGHMEM64G if X86_NUMAQ
+	default HIGHMEM4G
 	depends on X86_32
 
 config NOHIGHMEM
@@ -1251,7 +1251,7 @@ source "mm/Kconfig"
 
 config HIGHPTE
 	bool "Allocate 3rd-level pagetables from highmem"
-	depends on X86_32 && (HIGHMEM4G || HIGHMEM64G)
+	depends on HIGHMEM
 	---help---
 	  The VM uses one page table entry for each page of physical memory.
 	  For systems with a lot of RAM, this can be wasteful of precious

Re: [PATCH] ix86: minor highmem related Kconfig cleanup

[H. Peter Anvin]

Jan Beulich wrote:
> Remove a redundant conditional and consolidate a dependency.
> 
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> 
>  config HIGHPTE
>  	bool "Allocate 3rd-level pagetables from highmem"
> -	depends on X86_32 && (HIGHMEM4G || HIGHMEM64G)
> +	depends on HIGHMEM
>  	---help---
>  	  The VM uses one page table entry for each page of physical memory.
>  	  For systems with a lot of RAM, this can be wasteful of precious
> 

This is probably correct, but the "3rd-level" should have been removed
from the description long ago when this was made available to non-PAE
mode (if it ever wasn't.)

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.