memblock: replace __alloc_bootmem with memblock_alloc_from

[sfrench/cifs-2.6.git] / arch / alpha / kernel / pci_iommu.c

diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index b52d76fd534e6ee1015806e203262ea9c3fd0076..0c05493e649568d1baa7dbe71dee6e1dd7777619 100644 (file)
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -87,13 +87,13 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base,
                printk("%s: couldn't allocate arena ptes from node %d\n"
                       "    falling back to system-wide allocation\n",
                       __func__, nid);
-               arena->ptes = __alloc_bootmem(mem_size, align, 0);
+               arena->ptes = memblock_alloc_from(mem_size, align, 0);
        }
 
 #else /* CONFIG_DISCONTIGMEM */
 
        arena = alloc_bootmem(sizeof(*arena));
-       arena->ptes = __alloc_bootmem(mem_size, align, 0);
+       arena->ptes = memblock_alloc_from(mem_size, align, 0);
 
 #endif /* CONFIG_DISCONTIGMEM */