diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-07-27 16:21:15 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-07-27 16:21:15 +0300 |
| commit | fc9eb93cd4c5d819e9a68a7906d78ce37f42d8cd (patch) | |
| tree | 821a265ae21cbc1b350afa05da413e89b89f034e /arch/m32r/kernel/smp.c | |
| parent | 772d68355e2f65f71e0402e39aabfdea56f55083 (diff) | |
| parent | 41b9e9fcc1c44b84a785115058ce9c703e3fca6e (diff) | |
| download | linux-fc9eb93cd4c5d819e9a68a7906d78ce37f42d8cd.tar.xz | |
Merge branch 'locking/arch-atomic' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into aarch64/for-next/core
Merge in PeterZ's logical atomic ops so that we can implement them in
our subsequent LSE atomics.
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) cpumask_clear_cpu(smp_processor_id(), &cpumask); spin_lock(&flushcache_lock); mask=cpumask_bits(&cpumask); - atomic_set_mask(*mask, (atomic_t *)&flushcache_cpumask); + atomic_or(*mask, (atomic_t *)&flushcache_cpumask); send_IPI_mask(&cpumask, INVALIDATE_CACHE_IPI, 0); _flush_cache_copyback_all(); while (flushcache_cpumask) @@ -407,7 +407,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm, flush_vma = vma; flush_va = va; mask=cpumask_bits(&cpumask); - atomic_set_mask(*mask, (atomic_t *)&flush_cpumask); + atomic_or(*mask, (atomic_t *)&flush_cpumask); /* * We have to send the IPI only to |