mm: remove include/linux/bootmem.h

[linux-2.6-block.git] / arch / ia64 / sn / kernel / io_common.c

diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 102aabad6d20afdb9bfff0804311d4fd683a138c..98f55220c67df0cbf5c3c69bde23c01a61d0edd0 100644 (file)
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2006 Silicon Graphics, Inc. All rights reserved.
  */
 
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <asm/sn/types.h>
@@ -385,16 +385,13 @@ void __init hubdev_init_node(nodepda_t * npda, cnodeid_t node)
 {
        struct hubdev_info *hubdev_info;
        int size;
-       pg_data_t *pg;
 
        size = sizeof(struct hubdev_info);
 
        if (node >= num_online_nodes()) /* Headless/memless IO nodes */
-               pg = NODE_DATA(0);
-       else
-               pg = NODE_DATA(node);
+               node = 0;
 
-       hubdev_info = (struct hubdev_info *)alloc_bootmem_node(pg, size);
+       hubdev_info = (struct hubdev_info *)memblock_alloc_node(size, 0, node);
 
        npda->pdinfo = (void *)hubdev_info;
 }