Re: [2.6 patch] some fixups for the X86_NUMAQ dependencies

[Martin J. Bligh]

Adrian Bunk wrote:
> You must always ensure to fulfill the dependencies of what you are 
> select'ing.
>
>
> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
>
> ---
>
>  arch/i386/Kconfig |    7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> --- linux-2.6.16-rc3-mm1-full/arch/i386/Kconfig.old	2006-02-20 00:12:50.000000000 +0100
> +++ linux-2.6.16-rc3-mm1-full/arch/i386/Kconfig	2006-02-20 00:17:57.000000000 +0100
> @@ -84,6 +84,7 @@
>  
>  config X86_NUMAQ
>  	bool "NUMAQ (IBM/Sequent)"
> +	select SMP
>  	select NUMA
>  	help
>  	  This option is used for getting Linux to run on a (IBM/Sequent) NUMA
> @@ -419,6 +420,7 @@

Surely NUMA should select SMP, not NUMA-Q?

>  config NOHIGHMEM
>  	bool "off"
> +	depends on !X86_NUMAQ
>  	---help---
>  	  Linux can use up to 64 Gigabytes of physical memory on x86 systems.
>  	  However, the address space of 32-bit x86 processors is only 4
> @@ -455,6 +457,7 @@
>  
>  config HIGHMEM4G
>  	bool "4GB"
> +	depends on !X86_NUMAQ
>  	help
>  	  Select this if you have a 32-bit processor and between 1 and 4
>  	  gigabytes of physical RAM.
> @@ -522,10 +525,6 @@
>  	default n if X86_PC
>  	default y if (X86_NUMAQ || X86_SUMMIT)
>  
> -# Need comments to help the hapless user trying to turn on NUMA support
> -comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
> -	depends on X86_NUMAQ && (!HIGHMEM64G || !SMP)
> -

Hmm. ISTR the reason we put that in there in the first place was that
NUMA-Q got mysteriously hidden by other deps before, and it wasn't clear 
how to select it. Perhaps we just had some of the deps backwards.

M.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/