Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d3fdb15 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

iommu-common: move to arch/sparc 



This code is only used by sparc, and all new iommu drivers should use the
drivers/iommu/ framework.  Also remove the unused exports.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarAnshuman Khandual <khandual@linux.vnet.ibm.com>
parent 6e88628d

arch/sparc/include/asm/iommu_64.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define IOPTE_WRITE   0x0000000000000002UL



#define IOMMU_NUM_CTXS	4096

#include <linux/iommu-common.h>

#include <asm/iommu-common.h>



struct iommu_arena {

	unsigned long	*map;

arch/sparc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ obj-$(CONFIG_SPARC32) += leon_pmc.o 


obj-$(CONFIG_SPARC64)   += reboot.o

obj-$(CONFIG_SPARC64)   += sysfs.o

obj-$(CONFIG_SPARC64)   += iommu.o

obj-$(CONFIG_SPARC64)   += iommu.o iommu-common.o

obj-$(CONFIG_SPARC64)   += central.o

obj-$(CONFIG_SPARC64)   += starfire.o

obj-$(CONFIG_SPARC64)   += power.o

lib/iommu-common.c→arch/sparc/kernel/iommu-common.c

+1 −4
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
#include <linux/bitmap.h>

#include <linux/bug.h>

#include <linux/iommu-helper.h>

#include <linux/iommu-common.h>

#include <linux/dma-mapping.h>

#include <linux/hash.h>

#include <asm/iommu-common.h>



static unsigned long iommu_large_alloc = 15;
@@ -93,7 +93,6 @@ void iommu_tbl_pool_init(struct iommu_map_table *iommu, 
	p->hint = p->start;

	p->end = num_entries;

}

EXPORT_SYMBOL(iommu_tbl_pool_init);



unsigned long iommu_tbl_range_alloc(struct device *dev,

				struct iommu_map_table *iommu,
@@ -224,7 +223,6 @@ unsigned long iommu_tbl_range_alloc(struct device *dev, 


	return n;

}

EXPORT_SYMBOL(iommu_tbl_range_alloc);



static struct iommu_pool *get_pool(struct iommu_map_table *tbl,

				   unsigned long entry)
@@ -264,4 +262,3 @@ void iommu_tbl_range_free(struct iommu_map_table *iommu, u64 dma_addr, 
	bitmap_clear(iommu->map, entry, npages);

	spin_unlock_irqrestore(&(pool->lock), flags);

}
 
EXPORT_SYMBOL(iommu_tbl_range_free);

arch/sparc/kernel/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/errno.h>

#include <linux/iommu-helper.h>

#include <linux/bitmap.h>

#include <linux/iommu-common.h>

#include <asm/iommu-common.h>



#ifdef CONFIG_PCI

#include <linux/pci.h>