Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge

[mv-sheeva.git] / arch / sh / mm / init.c

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 6cbef8caeb560e69776579d5525bbad028e9aaec..3edf297c829bd141ef7765f385eaf738fa0386db 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -311,7 +311,8 @@ int arch_add_memory(int nid, u64 start, u64 size)
        pgdat = NODE_DATA(nid);
 
        /* We only have ZONE_NORMAL, so this is easy.. */
-       ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
+       ret = __add_pages(nid, pgdat->node_zones + ZONE_NORMAL,
+                               start_pfn, nr_pages);
        if (unlikely(ret))
                printk("%s: Failed, __add_pages() == %d\n", __func__, ret);