git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
numa_64.c
diff --git
a/arch/x86/mm/numa_64.c
b/arch/x86/mm/numa_64.c
index
8948f47
..
a7bcc23
100644
(file)
--- a/
arch/x86/mm/numa_64.c
+++ b/
arch/x86/mm/numa_64.c
@@
-33,9
+33,6
@@
int numa_off __initdata;
static unsigned long __initdata nodemap_addr;
static unsigned long __initdata nodemap_size;
static unsigned long __initdata nodemap_addr;
static unsigned long __initdata nodemap_size;
-DEFINE_PER_CPU(int, node_number) = 0;
-EXPORT_PER_CPU_SYMBOL(node_number);
-
/*
* Map cpu index to node index
*/
/*
* Map cpu index to node index
*/
@@
-809,7
+806,7
@@
void __cpuinit numa_set_node(int cpu, int node)
per_cpu(x86_cpu_to_node_map, cpu) = node;
if (node != NUMA_NO_NODE)
per_cpu(x86_cpu_to_node_map, cpu) = node;
if (node != NUMA_NO_NODE)
-
per_cpu(node_number, cpu) = node
;
+
set_cpu_numa_node(cpu, node)
;
}
void __cpuinit numa_clear_node(int cpu)
}
void __cpuinit numa_clear_node(int cpu)
@@
-867,7
+864,7
@@
void __cpuinit numa_remove_cpu(int cpu)
numa_set_cpumask(cpu, 0);
}
numa_set_cpumask(cpu, 0);
}
-int cpu_to_node(int cpu)
+int
__
cpu_to_node(int cpu)
{
if (early_per_cpu_ptr(x86_cpu_to_node_map)) {
printk(KERN_WARNING
{
if (early_per_cpu_ptr(x86_cpu_to_node_map)) {
printk(KERN_WARNING
@@
-877,7
+874,7
@@
int cpu_to_node(int cpu)
}
return per_cpu(x86_cpu_to_node_map, cpu);
}
}
return per_cpu(x86_cpu_to_node_map, cpu);
}
-EXPORT_SYMBOL(cpu_to_node);
+EXPORT_SYMBOL(
__
cpu_to_node);
/*
* Same function as cpu_to_node() but used if called before the
/*
* Same function as cpu_to_node() but used if called before the