x86: Fixup NR-CPUS patch for numa

PATCH In review [email protected] 3 participants 4 messages Jan 16, 2008 – Jan 18, 2008 1 message not in the archive

Subsystems (3)

Memory management x86 x86 MM

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

[email protected]

author

2008-01-16 18:34 UTC #1 lore raw

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

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 <[email protected]>

---
 arch/x86/mm/numa_64.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

arch/x86/mm/numa_64.c +1 -3

@@ -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;

Signature · 5 lines

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

Andrew Morton

maintainer

2008-01-17 18:30 UTC #2 lore raw

Quoted 6 lines · On Wed, 16 Jan 2008 10:34:39 -0800 [email protected] 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.

Quoted 4 lines

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 [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Mike Travis

author

2008-01-17 18:51 UTC #3 lore raw

Quoted 11 lines · Andrew Morton

Quoted 6 lines · On Wed, 16 Jan 2008 10:34:39 -0800 [email protected] 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

Quoted 9 lines

Quoted 5 lines
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

Ingo Molnar

2008-01-18 12:08 UTC #4 lore raw

In reply to Andrew Morton

Quoted 7 lines · Andrew Morton

Quoted 3 lines
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