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 git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
mm
/
init.c
diff --git
a/arch/ia64/mm/init.c
b/arch/ia64/mm/init.c
index
054bcd9
..
56e1290
100644
(file)
--- a/
arch/ia64/mm/init.c
+++ b/
arch/ia64/mm/init.c
@@
-692,7
+692,7
@@
int arch_add_memory(int nid, u64 start, u64 size)
pgdat = NODE_DATA(nid);
zone = pgdat->node_zones + ZONE_NORMAL;
- ret = __add_pages(zone, start_pfn, nr_pages);
+ ret = __add_pages(
nid,
zone, start_pfn, nr_pages);
if (ret)
printk("%s: Problem encountered in __add_pages() as ret=%d\n",