sparc: Revert generic IOMMU allocator.

I applied the wrong version of this patch series, V4 instead
of V10, due to a patchwork bundling snafu.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/sparc/include/asm/iommu_64.h b/arch/sparc/include/asm/iommu_64.h
index e3cd4493d81d..2b9321ab064d 100644
--- a/arch/sparc/include/asm/iommu_64.h
+++ b/arch/sparc/include/asm/iommu_64.h
@@ -16,7 +16,6 @@
 #define IOPTE_WRITE   0x0000000000000002UL
 
 #define IOMMU_NUM_CTXS  4096
-#include <linux/iommu-common.h>
 
 struct iommu_arena {
         unsigned long   *map;
@@ -25,10 +24,11 @@ struct iommu_arena {
 };
 
 struct iommu {
-        struct iommu_table      tbl;
         spinlock_t              lock;
-        u32                     dma_addr_mask;
+        struct iommu_arena      arena;
+        void                    (*flush_all)(struct iommu *);
         iopte_t                 *page_table;
+        u32                     page_table_map_base;
         unsigned long           iommu_control;
         unsigned long           iommu_tsbbase;
         unsigned long           iommu_flush;
@@ -40,6 +40,7 @@ struct iommu {
         unsigned long           dummy_page_pa;
         unsigned long           ctx_lowest_free;
         DECLARE_BITMAP(ctx_bitmap, IOMMU_NUM_CTXS);
+        u32                     dma_addr_mask;
 };
 
 struct strbuf {