Commit 187b5f41 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Martin Schwidefsky
Browse files

s390: replace ACCESS_ONCE with READ_ONCE 



Remove the last places of ACCESS_ONCE in s390 code.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d3217967

arch/s390/include/asm/spinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static inline int arch_spin_value_unlocked(arch_spinlock_t lock) 


static inline int arch_spin_is_locked(arch_spinlock_t *lp)

{

	return ACCESS_ONCE(lp->lock) != 0;

	return READ_ONCE(lp->lock) != 0;

}



static inline int arch_spin_trylock_once(arch_spinlock_t *lp)

arch/s390/kernel/idle.c

+7 −7
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ static ssize_t show_idle_count(struct device *dev, 


	do {

		seq = read_seqcount_begin(&idle->seqcount);

		idle_count = ACCESS_ONCE(idle->idle_count);

		if (ACCESS_ONCE(idle->clock_idle_enter))

		idle_count = READ_ONCE(idle->idle_count);

		if (READ_ONCE(idle->clock_idle_enter))

			idle_count++;

	} while (read_seqcount_retry(&idle->seqcount, seq));

	return sprintf(buf, "%llu\n", idle_count);
@@ -75,9 +75,9 @@ static ssize_t show_idle_time(struct device *dev, 
	do {

		now = get_tod_clock();

		seq = read_seqcount_begin(&idle->seqcount);

		idle_time = ACCESS_ONCE(idle->idle_time);

		idle_enter = ACCESS_ONCE(idle->clock_idle_enter);

		idle_exit = ACCESS_ONCE(idle->clock_idle_exit);

		idle_time = READ_ONCE(idle->idle_time);

		idle_enter = READ_ONCE(idle->clock_idle_enter);

		idle_exit = READ_ONCE(idle->clock_idle_exit);

	} while (read_seqcount_retry(&idle->seqcount, seq));

	idle_time += idle_enter ? ((idle_exit ? : now) - idle_enter) : 0;

	return sprintf(buf, "%llu\n", idle_time >> 12);
@@ -93,8 +93,8 @@ cputime64_t arch_cpu_idle_time(int cpu) 
	do {

		now = get_tod_clock();

		seq = read_seqcount_begin(&idle->seqcount);

		idle_enter = ACCESS_ONCE(idle->clock_idle_enter);

		idle_exit = ACCESS_ONCE(idle->clock_idle_exit);

		idle_enter = READ_ONCE(idle->clock_idle_enter);

		idle_exit = READ_ONCE(idle->clock_idle_exit);

	} while (read_seqcount_retry(&idle->seqcount, seq));

	return idle_enter ? ((idle_exit ?: now) - idle_enter) : 0;

}

arch/s390/lib/spinlock.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int arch_spin_trylock_retry(arch_spinlock_t *lp) 
	int count;



	for (count = spin_retry; count > 0; count--) {

		owner = ACCESS_ONCE(lp->lock);

		owner = READ_ONCE(lp->lock);

		/* Try to get the lock if it is free. */

		if (!owner) {

			if (_raw_compare_and_swap(&lp->lock, 0, cpu))