Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: fix early cpu_to_node panic from nr_free_zone_pages

Browse Source 
call early_cpu_to_node() since per_cpu(cpu_to_node_map) might not be setup
yet.

I also had to export x86_cpu_to_node_map_early_ptr because of some calls
from the network code to numa_node_id():

	net/ipv4/netfilter/arp_tables.c:
	net/ipv4/netfilter/ip_tables.c:
	net/ipv4/netfilter/ip_tables.c:

Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Mike Travis 2008-01-30 13:33:25 +01:00 committed by Ingo Molnar
parent c84d6af881
commit 625d6cffca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/mm/numa_64.c
View File

@ -37,9 +37,7 @@ u16 x86_cpu_to_node_map_init[NR_CPUS] = {
void *x86_cpu_to_node_map_early_ptr; void *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);
#ifdef CONFIG_DEBUG_PER_CPU_MAPS
EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr); EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr);
#endif
u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE

2
include/asm-x86/topology.h
View File

@ -37,6 +37,8 @@ extern u8 cpu_to_node_map[];
DECLARE_PER_CPU(u16, x86_cpu_to_node_map); DECLARE_PER_CPU(u16, x86_cpu_to_node_map);
extern u16 x86_cpu_to_node_map_init[]; extern u16 x86_cpu_to_node_map_init[];
extern void *x86_cpu_to_node_map_early_ptr; extern void *x86_cpu_to_node_map_early_ptr;
/* Returns the number of the current Node. */
#define numa_node_id() (early_cpu_to_node(raw_smp_processor_id()))
#endif #endif
extern cpumask_t node_to_cpumask_map[]; extern cpumask_t node_to_cpumask_map[];