diff options
author | Peter Zijlstra <peterz@infradead.org> | 2015-04-23 19:12:32 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-27 08:06:24 -0400 |
commit | 805de8f43c20ba8b479bb598b543fa86b20067f6 (patch) | |
tree | b5f367bde66a4dded45243d435a8ab00cb5f580b /arch/m32r/kernel/smp.c | |
parent | de9e432cb5de1bf2952919dc0b22e4bec0ed8d53 (diff) |
atomic: Replace atomic_{set,clear}_mask() usage
Replace the deprecated atomic_{set,clear}_mask() usage with the now
ubiquous atomic_{or,andnot}() functions.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m32r/kernel/smp.c')
-rw-r--r-- | arch/m32r/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c index c18ddc74ef9a..62d6961e7f2b 100644 --- a/arch/m32r/kernel/smp.c +++ b/arch/m32r/kernel/smp.c | |||
@@ -156,7 +156,7 @@ void smp_flush_cache_all(void) | |||
156 | cpumask_clear_cpu(smp_processor_id(), &cpumask); | 156 | cpumask_clear_cpu(smp_processor_id(), &cpumask); |
157 | spin_lock(&flushcache_lock); | 157 | spin_lock(&flushcache_lock); |
158 | mask=cpumask_bits(&cpumask); | 158 | mask=cpumask_bits(&cpumask); |
159 | atomic_set_mask(*mask, (atomic_t *)&flushcache_cpumask); | 159 | atomic_or(*mask, (atomic_t *)&flushcache_cpumask); |
160 | send_IPI_mask(&cpumask, INVALIDATE_CACHE_IPI, 0); | 160 | send_IPI_mask(&cpumask, INVALIDATE_CACHE_IPI, 0); |
161 | _flush_cache_copyback_all(); | 161 | _flush_cache_copyback_all(); |
162 | while (flushcache_cpumask) | 162 | while (flushcache_cpumask) |
@@ -407,7 +407,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm, | |||
407 | flush_vma = vma; | 407 | flush_vma = vma; |
408 | flush_va = va; | 408 | flush_va = va; |
409 | mask=cpumask_bits(&cpumask); | 409 | mask=cpumask_bits(&cpumask); |
410 | atomic_set_mask(*mask, (atomic_t *)&flush_cpumask); | 410 | atomic_or(*mask, (atomic_t *)&flush_cpumask); |
411 | 411 | ||
412 | /* | 412 | /* |
413 | * We have to send the IPI only to | 413 | * We have to send the IPI only to |