These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / m32r / kernel / smp.c

diff --git a/kernel/arch/m32r/kernel/smp.c b/kernel/arch/m32r/kernel/smp.c
index c18ddc7..62d6961 100644 (file)
--- a/kernel/arch/m32r/kernel/smp.c
+++ b/kernel/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