Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 316390b0 authored by travis@sgi.com's avatar travis@sgi.com Committed by Ingo Molnar
Browse files

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.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 28c6075c

arch/x86/mm/numa_64.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -35,8 +35,6 @@ u16 x86_cpu_to_node_map_init[NR_CPUS] = { 
	[0 ... NR_CPUS-1] = NUMA_NO_NODE

	[0 ... NR_CPUS-1] = NUMA_NO_NODE

};

};

void *x86_cpu_to_node_map_early_ptr;

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;

DEFINE_PER_CPU(u16, x86_cpu_to_node_map) = NUMA_NO_NODE;

EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map);

EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map);
@@ -88,7 +86,7 @@ static int __init allocate_cachealigned_memnodemap(void) 
	unsigned long pad, pad_addr;

	unsigned long pad, pad_addr;





	memnodemap = memnode.embedded_map;

	memnodemap = memnode.embedded_map;

	if (memnodemapsize <= 48)

	if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map))

		return 0;

		return 0;





	pad = L1_CACHE_BYTES - 1;

	pad = L1_CACHE_BYTES - 1;