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 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...
[pandora-kernel.git]
/
arch
/
sparc64
/
mm
/
init.c
diff --git
a/arch/sparc64/mm/init.c
b/arch/sparc64/mm/init.c
index
84898c4
..
7132974
100644
(file)
--- a/
arch/sparc64/mm/init.c
+++ b/
arch/sparc64/mm/init.c
@@
-788,7
+788,6
@@
int numa_cpu_lookup_table[NR_CPUS];
cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES];
#ifdef CONFIG_NEED_MULTIPLE_NODES
cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES];
#ifdef CONFIG_NEED_MULTIPLE_NODES
-static bootmem_data_t plat_node_bdata[MAX_NUMNODES];
struct mdesc_mblock {
u64 base;
struct mdesc_mblock {
u64 base;
@@
-871,7
+870,7
@@
static void __init allocate_node_data(int nid)
NODE_DATA(nid) = __va(paddr);
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
NODE_DATA(nid) = __va(paddr);
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
- NODE_DATA(nid)->bdata = &
plat_node_b
data[nid];
+ NODE_DATA(nid)->bdata = &
bootmem_node_
data[nid];
#endif
p = NODE_DATA(nid);
#endif
p = NODE_DATA(nid);