diff options
| author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2015-04-19 13:13:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-20 14:09:55 -0400 |
| commit | 7b3372d4c2bced80598771aab8fea87c40ebb52a (patch) | |
| tree | 59973233562e6a2366e65e8b6ac06d59d06aef07 /lib/iommu-common.c | |
| parent | b0cc836d306c12462a60e72aae8f6d2318f10817 (diff) | |
| download | linux-7b3372d4c2bced80598771aab8fea87c40ebb52a.tar.gz linux-7b3372d4c2bced80598771aab8fea87c40ebb52a.tar.bz2 linux-7b3372d4c2bced80598771aab8fea87c40ebb52a.zip | |
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: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/iommu-common.c')
| -rw-r--r-- | lib/iommu-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/iommu-common.c b/lib/iommu-common.c index a9a53f566237..df30632f0bef 100644 --- a/lib/iommu-common.c +++ b/lib/iommu-common.c @@ -17,7 +17,7 @@ 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); } /* @@ -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; |