Commit 7b3372d4 authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller

iommu-common: rename iommu_pool_hash to iommu_hash_common

When CONFIG_DEBUG_FORCE_WEAK_PER_CPU is set, the DEFINE_PER_CPU_SECTION
macro will define an extern __pcpu_unique_##name variable that could
conflict with the same definition in powerpc at this time. Avoid that
conflict by renaming iommu_pool_hash in iommu-common.c

Thanks to Guenter Roeck for catching this, and helping to test the fix.
Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0cc836d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
static 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) static inline bool need_flush(struct iommu_map_table *iommu)
{ {
...@@ -44,7 +44,7 @@ static void setup_iommu_pool_hash(void) ...@@ -44,7 +44,7 @@ static void setup_iommu_pool_hash(void)
return; return;
do_once = true; do_once = true;
for_each_possible_cpu(i) 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);
} }
/* /*
...@@ -106,7 +106,7 @@ unsigned long iommu_tbl_range_alloc(struct device *dev, ...@@ -106,7 +106,7 @@ unsigned long iommu_tbl_range_alloc(struct device *dev,
unsigned long mask, unsigned long mask,
unsigned int align_order) 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; unsigned long n, end, start, limit, boundary_size;
struct iommu_pool *pool; struct iommu_pool *pool;
int pass = 0; int pass = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment