Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 805de8f4 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent de9e432c

arch/blackfin/mach-common/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ void send_ipi(const struct cpumask *cpumask, enum ipi_message_type msg) 
	local_irq_save(flags);

	for_each_cpu(cpu, cpumask) {

		bfin_ipi_data = &per_cpu(bfin_ipi, cpu);

		atomic_set_mask((1 << msg), &bfin_ipi_data->bits);

		atomic_or((1 << msg), &bfin_ipi_data->bits);

		atomic_inc(&bfin_ipi_data->count);

	}

	local_irq_restore(flags);

arch/m32r/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/mn10300/mm/tlb-smp.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm, 
	flush_mm = mm;

	flush_va = va;

#if NR_CPUS <= BITS_PER_LONG

	atomic_set_mask(cpumask.bits[0], &flush_cpumask.bits[0]);

	atomic_or(cpumask.bits[0], (atomic_t *)&flush_cpumask.bits[0]);

#else

#error Not supported.

#endif

arch/s390/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static void disable_sync_clock(void *dummy) 
	 * increase the "sequence" counter to avoid the race of an

	 * etr event and the complete recovery against get_sync_clock.

	 */

	atomic_clear_mask(0x80000000, sw_ptr);

	atomic_andnot(0x80000000, sw_ptr);

	atomic_inc(sw_ptr);

}
@@ -392,7 +392,7 @@ static void disable_sync_clock(void *dummy) 
static void enable_sync_clock(void)

{

	atomic_t *sw_ptr = this_cpu_ptr(&clock_sync_word);

	atomic_set_mask(0x80000000, sw_ptr);

	atomic_or(0x80000000, sw_ptr);

}



/*

arch/s390/kvm/interrupt.c

+15 −15
Original line number Diff line number Diff line
@@ -170,19 +170,19 @@ static unsigned long deliverable_irqs(struct kvm_vcpu *vcpu) 


static void __set_cpu_idle(struct kvm_vcpu *vcpu)

{

	atomic_set_mask(CPUSTAT_WAIT, &vcpu->arch.sie_block->cpuflags);

	atomic_or(CPUSTAT_WAIT, &vcpu->arch.sie_block->cpuflags);

	set_bit(vcpu->vcpu_id, vcpu->arch.local_int.float_int->idle_mask);

}



static void __unset_cpu_idle(struct kvm_vcpu *vcpu)

{

	atomic_clear_mask(CPUSTAT_WAIT, &vcpu->arch.sie_block->cpuflags);

	atomic_andnot(CPUSTAT_WAIT, &vcpu->arch.sie_block->cpuflags);

	clear_bit(vcpu->vcpu_id, vcpu->arch.local_int.float_int->idle_mask);

}



static void __reset_intercept_indicators(struct kvm_vcpu *vcpu)

{

	atomic_clear_mask(CPUSTAT_IO_INT | CPUSTAT_EXT_INT | CPUSTAT_STOP_INT,

	atomic_andnot(CPUSTAT_IO_INT | CPUSTAT_EXT_INT | CPUSTAT_STOP_INT,

		    &vcpu->arch.sie_block->cpuflags);

	vcpu->arch.sie_block->lctl = 0x0000;

	vcpu->arch.sie_block->ictl &= ~(ICTL_LPSW | ICTL_STCTL | ICTL_PINT);
@@ -196,7 +196,7 @@ static void __reset_intercept_indicators(struct kvm_vcpu *vcpu) 


static void __set_cpuflag(struct kvm_vcpu *vcpu, u32 flag)

{

	atomic_set_mask(flag, &vcpu->arch.sie_block->cpuflags);

	atomic_or(flag, &vcpu->arch.sie_block->cpuflags);

}



static void set_intercept_indicators_io(struct kvm_vcpu *vcpu)
@@ -919,7 +919,7 @@ void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcpu) 
	spin_unlock(&li->lock);



	/* clear pending external calls set by sigp interpretation facility */

	atomic_clear_mask(CPUSTAT_ECALL_PEND, li->cpuflags);

	atomic_andnot(CPUSTAT_ECALL_PEND, li->cpuflags);

	vcpu->kvm->arch.sca->cpu[vcpu->vcpu_id].sigp_ctrl = 0;

}
@@ -1020,7 +1020,7 @@ static int __inject_pfault_init(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) 


	li->irq.ext = irq->u.ext;

	set_bit(IRQ_PEND_PFAULT_INIT, &li->pending_irqs);

	atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);

	atomic_or(CPUSTAT_EXT_INT, li->cpuflags);

	return 0;

}
@@ -1035,7 +1035,7 @@ static int __inject_extcall_sigpif(struct kvm_vcpu *vcpu, uint16_t src_id) 
		/* another external call is pending */

		return -EBUSY;

	}

	atomic_set_mask(CPUSTAT_ECALL_PEND, &vcpu->arch.sie_block->cpuflags);

	atomic_or(CPUSTAT_ECALL_PEND, &vcpu->arch.sie_block->cpuflags);

	return 0;

}
@@ -1061,7 +1061,7 @@ static int __inject_extcall(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) 
	if (test_and_set_bit(IRQ_PEND_EXT_EXTERNAL, &li->pending_irqs))

		return -EBUSY;

	*extcall = irq->u.extcall;

	atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);

	atomic_or(CPUSTAT_EXT_INT, li->cpuflags);

	return 0;

}
@@ -1133,7 +1133,7 @@ static int __inject_sigp_emergency(struct kvm_vcpu *vcpu, 


	set_bit(irq->u.emerg.code, li->sigp_emerg_pending);

	set_bit(IRQ_PEND_EXT_EMERGENCY, &li->pending_irqs);

	atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);

	atomic_or(CPUSTAT_EXT_INT, li->cpuflags);

	return 0;

}
@@ -1177,7 +1177,7 @@ static int __inject_ckc(struct kvm_vcpu *vcpu) 
				   0, 0, 2);



	set_bit(IRQ_PEND_EXT_CLOCK_COMP, &li->pending_irqs);

	atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);

	atomic_or(CPUSTAT_EXT_INT, li->cpuflags);

	return 0;

}
@@ -1190,7 +1190,7 @@ static int __inject_cpu_timer(struct kvm_vcpu *vcpu) 
				   0, 0, 2);



	set_bit(IRQ_PEND_EXT_CPU_TIMER, &li->pending_irqs);

	atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);

	atomic_or(CPUSTAT_EXT_INT, li->cpuflags);

	return 0;

}
@@ -1369,13 +1369,13 @@ static void __floating_irq_kick(struct kvm *kvm, u64 type) 
	spin_lock(&li->lock);

	switch (type) {

	case KVM_S390_MCHK:

		atomic_set_mask(CPUSTAT_STOP_INT, li->cpuflags);

		atomic_or(CPUSTAT_STOP_INT, li->cpuflags);

		break;

	case KVM_S390_INT_IO_MIN...KVM_S390_INT_IO_MAX:

		atomic_set_mask(CPUSTAT_IO_INT, li->cpuflags);

		atomic_or(CPUSTAT_IO_INT, li->cpuflags);

		break;

	default:

		atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);

		atomic_or(CPUSTAT_EXT_INT, li->cpuflags);

		break;

	}

	spin_unlock(&li->lock);