[PATCH 1/1] x86: Fixup NR-CPUS patch for numa

[PATCH 1/1] x86: Fixup NR-CPUS patch for numa

[travis]

[-- Attachment #1: fixup-nr-cpus --]
[-- Type: text/plain, Size: 1254 bytes --]

This patch removes the EXPORT_SYMBOL for:

	x86_cpu_to_node_map_init
	x86_cpu_to_node_map_early_ptr

... thus fixing the section mismatch problem.

Also, the mem -> node hash lookup is fixed.

Based on 2.6.24-rc6-mm1 + change-NR_CPUS-V3 patchset

Signed-off-by: Mike Travis <travis@sgi.com>
---
 arch/x86/mm/numa_64.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -35,8 +35,6 @@ u16 x86_cpu_to_node_map_init[NR_CPUS] __
 	[0 ... NR_CPUS-1] = NUMA_NO_NODE
 };
 void *x86_cpu_to_node_map_early_ptr;
-EXPORT_SYMBOL(x86_cpu_to_node_map_init);
-EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr);
 DEFINE_PER_CPU(u16, x86_cpu_to_node_map) = NUMA_NO_NODE;
 EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map);
 
@@ -88,7 +86,7 @@ static int __init allocate_cachealigned_
 	unsigned long pad, pad_addr;
 
 	memnodemap = memnode.embedded_map;
-	if (memnodemapsize <= 48)
+	if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map))
 		return 0;
 
 	pad = L1_CACHE_BYTES - 1;

-- 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH 1/1] x86: Fixup NR-CPUS patch for numa

[Andrew Morton]

On Wed, 16 Jan 2008 10:34:39 -0800 travis@sgi.com wrote:

> This patch removes the EXPORT_SYMBOL for:
> 
> 	x86_cpu_to_node_map_init
> 	x86_cpu_to_node_map_early_ptr
> 
> ... thus fixing the section mismatch problem.

Which section mismatch problem?  Please always quote the error message when
fixing things like this.

> Also, the mem -> node hash lookup is fixed.
> 
> Based on 2.6.24-rc6-mm1 + change-NR_CPUS-V3 patchset
> 

hm, I've been hiding from those patches.

Are they ready?

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH 1/1] x86: Fixup NR-CPUS patch for numa

[Mike Travis]

Andrew Morton wrote:
> On Wed, 16 Jan 2008 10:34:39 -0800 travis@sgi.com wrote:
> 
>> This patch removes the EXPORT_SYMBOL for:
>>
>> 	x86_cpu_to_node_map_init
>> 	x86_cpu_to_node_map_early_ptr
>>
>> ... thus fixing the section mismatch problem.
> 
> Which section mismatch problem?  Please always quote the error message when
> fixing things like this.

Will do.  Basically, it's the error that caused you to add 

	arch-x86-mm-numa_64c-section-fix.patch
> 
>> Also, the mem -> node hash lookup is fixed.
>>
>> Based on 2.6.24-rc6-mm1 + change-NR_CPUS-V3 patchset
>>
> 
> hm, I've been hiding from those patches.
> 
> Are they ready?

Please wait a moment.  I'm resolving the conflicts between what's
in 2.6.24-rc8-mm1 and what's not.  I'll resubmit everything shortly.

Thanks!
Mike

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH 1/1] x86: Fixup NR-CPUS patch for numa

[Ingo Molnar]

* Andrew Morton <akpm@linux-foundation.org> wrote:

> > Also, the mem -> node hash lookup is fixed.
> > 
> > Based on 2.6.24-rc6-mm1 + change-NR_CPUS-V3 patchset
> 
> hm, I've been hiding from those patches.
> 
> Are they ready?

i'm carrying them in x86.git, and they are pretty robust, with one 
outstanding build failure.

( and i've asked Mike for a CONFIG_SMP_MAX debug option that selects the
  baddest high-end features we have with 1024 or 4096 CPUs, etc. - this 
  way allyesconfig bootups will show us any problems on that scale of 
  the spectrum. )

	Ingo

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>