[2.6 patch] add required dependencies to X86_NUMAQ

[2.6 patch] add required dependencies to X86_NUMAQ

[Adrian Bunk]

If you select another option, you have to ensure that the dependencies 
of the selected options are met.

The following patch adds to X86_NUMAQ the required dependencies for the 
selected NUMA:

--- linux-2.6.7-mm2-full/arch/i386/Kconfig.old	2004-06-24 22:42:32.000000000 +0200
+++ linux-2.6.7-mm2-full/arch/i386/Kconfig	2004-06-24 22:44:53.000000000 +0200
@@ -65,6 +65,7 @@
 
 config X86_NUMAQ
 	bool "NUMAQ (IBM/Sequent)"
+	depends on SMP && HIGHMEM64G
 	select DISCONTIGMEM
 	select NUMA
 	help


Please apply
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [2.6 patch] add required dependencies to X86_NUMAQ

[Martin J. Bligh]

> If you select another option, you have to ensure that the dependencies 
> of the selected options are met.
> 
> The following patch adds to X86_NUMAQ the required dependencies for the 
> selected NUMA:
> 
> --- linux-2.6.7-mm2-full/arch/i386/Kconfig.old	2004-06-24 22:42:32.000000000 +0200
> +++ linux-2.6.7-mm2-full/arch/i386/Kconfig	2004-06-24 22:44:53.000000000 +0200
> @@ -65,6 +65,7 @@
>  
>  config X86_NUMAQ
>  	bool "NUMAQ (IBM/Sequent)"
> +	depends on SMP && HIGHMEM64G
>  	select DISCONTIGMEM
>  	select NUMA
>  	help

Mmmm. As we already have this:

config NUMA
        bool "Numa Memory Allocation and Scheduler Support"
        depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SU
MMIT && ACPI))
        default n if X86_PC
        default y if (X86_NUMAQ || X86_SUMMIT)

do we really need to cascade it back out like that into everything that
selects NUMA? Perhaps we should make NUMA select SMP && HIGHMEM64G, rather
than depend on it?

M.

Re: [2.6 patch] add required dependencies to X86_NUMAQ

[Adrian Bunk]

On Thu, Jun 24, 2004 at 04:33:58PM -0700, Martin J. Bligh wrote:
> > If you select another option, you have to ensure that the dependencies 
> > of the selected options are met.
> > 
> > The following patch adds to X86_NUMAQ the required dependencies for the 
> > selected NUMA:
> > 
> > --- linux-2.6.7-mm2-full/arch/i386/Kconfig.old	2004-06-24 22:42:32.000000000 +0200
> > +++ linux-2.6.7-mm2-full/arch/i386/Kconfig	2004-06-24 22:44:53.000000000 +0200
> > @@ -65,6 +65,7 @@
> >  
> >  config X86_NUMAQ
> >  	bool "NUMAQ (IBM/Sequent)"
> > +	depends on SMP && HIGHMEM64G
> >  	select DISCONTIGMEM
> >  	select NUMA
> >  	help
> 
> Mmmm. As we already have this:
> 
> config NUMA
>         bool "Numa Memory Allocation and Scheduler Support"
>         depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SU
> MMIT && ACPI))
>         default n if X86_PC
>         default y if (X86_NUMAQ || X86_SUMMIT)
> 
> do we really need to cascade it back out like that into everything that
> selects NUMA? Perhaps we should make NUMA select SMP && HIGHMEM64G, rather
> than depend on it?

This would work for SMP, but according to my testing, select doesn't 
seem to work with options in choices like HIGHMEM64G.

> M.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed