[SPARC64]: Consolidate {sbus,pci}_iommu_arena.

Move to asm-sparc64/iommu.h and rename to plain "iommu_arena".

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index aefdcc51045b..355ed0ba937a 100644
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -77,7 +77,7 @@ static inline void iopte_make_dummy(struct pci_iommu *iommu, iopte_t *iopte)
 /* Based largely upon the ppc64 iommu allocator.  */
 static long pci_arena_alloc(struct pci_iommu *iommu, unsigned long npages)
 {
-        struct pci_iommu_arena *arena = &iommu->arena;
+        struct iommu_arena *arena = &iommu->arena;
         unsigned long n, i, start, end, limit;
         int pass;
 
@@ -116,7 +116,7 @@ again:
         return n;
 }
 
-static void pci_arena_free(struct pci_iommu_arena *arena, unsigned long base, unsigned long npages)
+static void pci_arena_free(struct iommu_arena *arena, unsigned long base, unsigned long npages)
 {
         unsigned long i;