diff options
| author | Mike Travis <travis@sgi.com> | 2008-01-30 13:33:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:25 +0100 |
| commit | 625d6cffcac1c96faa18d629f1271d63af0e05f2 (patch) | |
| tree | 71c41fee9bc95ab4b4678a23a17faba7b014ff4b /include/asm-x86/topology.h | |
| parent | c84d6af881be84687fa924f16b2f4b4690354165 (diff) | |
| download | linux-625d6cffcac1c96faa18d629f1271d63af0e05f2.tar.gz linux-625d6cffcac1c96faa18d629f1271d63af0e05f2.tar.bz2 linux-625d6cffcac1c96faa18d629f1271d63af0e05f2.zip | |
x86: fix early cpu_to_node panic from nr_free_zone_pages
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>
Diffstat (limited to 'include/asm-x86/topology.h')
| -rw-r--r-- | include/asm-x86/topology.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 9a8228a177c7..7b0cce2f370d 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h @@ -37,6 +37,8 @@ extern u8 cpu_to_node_map[]; DECLARE_PER_CPU(u16, x86_cpu_to_node_map); extern u16 x86_cpu_to_node_map_init[]; 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 extern cpumask_t node_to_cpumask_map[]; |