s390: replace ACCESS_ONCE with READ_ONCE

Remove the last places of ACCESS_ONCE in s390 code.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index 7ecd8902a5c36bc96dfe52083e067365a0d3a71d..ffc45048ea7d7534a71b0048467d821fae5ce55e 100644 (file)
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -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)

diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index 7a55c29b0b33a8ab4bbdc0c1ca7d7ba2dacdc3ab..8e5ef334bee5bfb652a03c7cb220de8954f2d835 100644 (file)
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -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;
 }

diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index 03462326ca3e8d25a00b926959f68f9247c713ff..ba427eb6f14cabc3464463c6126b1ab5e73df0e3 100644 (file)
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -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))