projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
iommu.c
diff --git
a/arch/powerpc/kernel/iommu.c
b/arch/powerpc/kernel/iommu.c
index
a83cf5e
..
5d3968c
100644
(file)
--- a/
arch/powerpc/kernel/iommu.c
+++ b/
arch/powerpc/kernel/iommu.c
@@
-208,7
+208,7
@@
static unsigned long iommu_range_alloc(struct device *dev,
* We don't need to disable preemption here because any CPU can
* safely use any IOMMU pool.
*/
* We don't need to disable preemption here because any CPU can
* safely use any IOMMU pool.
*/
- pool_nr = __
raw_get_cpu_var
(iommu_pool_hash) & (tbl->nr_pools - 1);
+ pool_nr = __
this_cpu_read
(iommu_pool_hash) & (tbl->nr_pools - 1);
if (largealloc)
pool = &(tbl->large_pool);
if (largealloc)
pool = &(tbl->large_pool);