sh: prefer memblock APIs returning virtual address

[linux-2.6-block.git] / arch / sh / mm / numa.c

diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c
index 830e8b3684e4248417464934b8634e4d303f4a16..c4bde614881086edf4febcd82e47da5e3918a527 100644 (file)
--- a/arch/sh/mm/numa.c
+++ b/arch/sh/mm/numa.c
@@ -41,9 +41,8 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
        __add_active_range(nid, start_pfn, end_pfn);
 
        /* Node-local pgdat */
-       NODE_DATA(nid) = __va(memblock_alloc_base(sizeof(struct pglist_data),
-                                            SMP_CACHE_BYTES, end));
-       memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
+       NODE_DATA(nid) = memblock_alloc_node(sizeof(struct pglist_data),
+                                            SMP_CACHE_BYTES, nid);
 
        NODE_DATA(nid)->node_start_pfn = start_pfn;
        NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;