diff options
| author | Brian Gerst | 2009-01-18 16:38:59 +0100 |
|---|---|---|
| committer | Tejun Heo | 2009-01-18 16:38:59 +0100 |
| commit | e7a22c1ebcc1caa8178df1819d05128bb5b45ab9 (patch) | |
| tree | 7769b1263850c97fa244a48ad9187ce0d74e1965 /arch/x86/include/asm | |
| parent | x86-64: Move irqcount from PDA to per-cpu. (diff) | |
| download | kernel-qcow2-linux-e7a22c1ebcc1caa8178df1819d05128bb5b45ab9.tar.gz kernel-qcow2-linux-e7a22c1ebcc1caa8178df1819d05128bb5b45ab9.tar.xz kernel-qcow2-linux-e7a22c1ebcc1caa8178df1819d05128bb5b45ab9.zip | |
x86-64: Move nodenumber from PDA to per-cpu.
tj: * s/nodenumber/node_number/
* removed now unused pda variable from pda_init()
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/pda.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/topology.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h index 4527d70314d4..b30ef6bddc43 100644 --- a/arch/x86/include/asm/pda.h +++ b/arch/x86/include/asm/pda.h @@ -22,7 +22,6 @@ struct x8664_pda { /* gcc-ABI: this canary MUST be at offset 40!!! */ #endif - short nodenumber; /* number of current node (32k max) */ short in_bootmem; /* pda lives in bootmem */ short isidle; } ____cacheline_aligned_in_smp; diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 87ca3fd86e88..ffea1fe03a99 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -83,7 +83,8 @@ extern cpumask_t *node_to_cpumask_map; DECLARE_EARLY_PER_CPU(int, x86_cpu_to_node_map); /* Returns the number of the current Node. */ -#define numa_node_id() read_pda(nodenumber) +DECLARE_PER_CPU(int, node_number); +#define numa_node_id() percpu_read(node_number) #ifdef CONFIG_DEBUG_PER_CPU_MAPS extern int cpu_to_node(int cpu); |