Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / pasemi / iommu.c

diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index f06c83f321e6c352869c69e859c399c14e2b9777..f2971522fb4aa842cb9128b5c7ccc46c6e8d47a5 100644 (file)
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -213,7 +213,7 @@ static int __init iob_init(struct device_node *dn)
        pr_info("IOBMAP L2 allocated at: %p\n", iob_l2_base);
 
        /* Allocate a spare page to map all invalid IOTLB pages. */
-       tmp = memblock_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);
+       tmp = memblock_phys_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);
        if (!tmp)
                panic("IOBMAP: Cannot allocate spare page!");
        /* Empty l1 is marked invalid */