From bd74c1243b2a25804574ac7d7ea07a991f3084cd Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 25 Jul 2012 21:19:51 +0000 Subject: [PATCH] --- yaml --- r: 330237 b: refs/heads/master c: 7db90c0222efeae676baa2c72758fcc00666e84f h: refs/heads/master i: 330235: a99ab96f9f26dac5079b27c30348849ffbfd532f v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pasemi/iommu.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cce2a19d9b6a..df1ad9c3f6d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70267a7f47a5565519da5ca2dde35d3ebf7d6ffb +refs/heads/master: 7db90c0222efeae676baa2c72758fcc00666e84f diff --git a/trunk/arch/powerpc/platforms/pasemi/iommu.c b/trunk/arch/powerpc/platforms/pasemi/iommu.c index 14943ef01918..f03fbc2b0f59 100644 --- a/trunk/arch/powerpc/platforms/pasemi/iommu.c +++ b/trunk/arch/powerpc/platforms/pasemi/iommu.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #define IOBMAP_PAGE_SHIFT 12 @@ -99,7 +98,7 @@ static int iobmap_build(struct iommu_table *tbl, long index, ip = ((u32 *)tbl->it_base) + index; while (npages--) { - rpn = virt_to_abs(uaddr) >> IOBMAP_PAGE_SHIFT; + rpn = __pa(uaddr) >> IOBMAP_PAGE_SHIFT; *(ip++) = IOBMAP_L2E_V | rpn; /* invalidate tlb, can be optimized more */ @@ -258,7 +257,7 @@ void __init alloc_iobmap_l2(void) return; #endif /* For 2G space, 8x64 pages (2^21 bytes) is max total l2 size */ - iob_l2_base = (u32 *)abs_to_virt(memblock_alloc_base(1UL<<21, 1UL<<21, 0x80000000)); + iob_l2_base = (u32 *)__va(memblock_alloc_base(1UL<<21, 1UL<<21, 0x80000000)); printk(KERN_INFO "IOBMAP L2 allocated at: %p\n", iob_l2_base); }