git.samba.org
/
sfrench
/
cifs-2.6.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...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
include
/
asm
/
mmzone.h
diff --git
a/arch/powerpc/include/asm/mmzone.h
b/arch/powerpc/include/asm/mmzone.h
index 35acac90c8ca6b3b32500c07cfc2b9586020cf39..aac87cbceb573d3fef41007df14795063ed07b70 100644
(file)
--- a/
arch/powerpc/include/asm/mmzone.h
+++ b/
arch/powerpc/include/asm/mmzone.h
@@
-30,7
+30,7
@@
extern struct pglist_data *node_data[];
*/
extern int numa_cpu_lookup_table[];
-extern cpumask_
t numa_cpumask_lookup_table
[];
+extern cpumask_
var_t node_to_cpumask_map
[];
#ifdef CONFIG_MEMORY_HOTPLUG
extern unsigned long max_pfn;
#endif