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

Commit 41137566 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'iommu-common-fixes' 



Sowmini Varadhan says:

====================
iommu-common build warning fixes.

This patchset has fixes for 2 architectures
- Part 1: x86_64 warnings generated by sparse
- Part 2: allmodconfig build error for powerpc, identified by Guenter Roeck.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 64fb1d0e 7b3372d4

lib/iommu-common.c

+10 −10
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
#define	DMA_ERROR_CODE (~(dma_addr_t)0x0)

#endif



unsigned long iommu_large_alloc = 15;

static unsigned long iommu_large_alloc = 15;



static	DEFINE_PER_CPU(unsigned int, iommu_pool_hash);

static	DEFINE_PER_CPU(unsigned int, iommu_hash_common);



static inline bool need_flush(struct iommu_map_table *iommu)

{
@@ -44,7 +44,7 @@ static void setup_iommu_pool_hash(void) 
		return;

	do_once = true;

	for_each_possible_cpu(i)

		per_cpu(iommu_pool_hash, i) = hash_32(i, IOMMU_POOL_HASHBITS);

		per_cpu(iommu_hash_common, i) = hash_32(i, IOMMU_POOL_HASHBITS);

}



/*
@@ -53,7 +53,7 @@ static void setup_iommu_pool_hash(void) 
 * the top 1/4 of the table will be set aside for pool allocations

 * of more than iommu_large_alloc pages.

 */

extern void iommu_tbl_pool_init(struct iommu_map_table *iommu,

void iommu_tbl_pool_init(struct iommu_map_table *iommu,

			 unsigned long num_entries,

			 u32 table_shift,

			 void (*lazy_flush)(struct iommu_map_table *),
@@ -106,7 +106,7 @@ unsigned long iommu_tbl_range_alloc(struct device *dev, 
				unsigned long mask,

				unsigned int align_order)

{

	unsigned int pool_hash = __this_cpu_read(iommu_pool_hash);

	unsigned int pool_hash = __this_cpu_read(iommu_hash_common);

	unsigned long n, end, start, limit, boundary_size;

	struct iommu_pool *pool;

	int pass = 0;