diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2024-11-06 11:03:14 +0100 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2024-11-12 14:01:29 +0100 |
| commit | 75a98ed6faa03656811922cd383994fa7c300259 (patch) | |
| tree | 4de0240a0e61a60f58db2b91cb139809878f0221 /arch/s390 | |
| parent | 5ba865ad579c6a7efc8f17dab760478a4c5eec66 (diff) | |
| download | linux-stable-75a98ed6faa03656811922cd383994fa7c300259.tar.gz linux-stable-75a98ed6faa03656811922cd383994fa7c300259.tar.bz2 linux-stable-75a98ed6faa03656811922cd383994fa7c300259.zip | |
s390/preempt: Use arch_try_cmpxchg() instead of __atomic_cmpxchg()
Use arch_try_cmpxchg() instead of __atomic_cmpxchg() in
preempt_count_set() to generate similar or better code,
depending in compiler features.
Reviewed-by: Juergen Christ <jchrist@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/preempt.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/s390/include/asm/preempt.h b/arch/s390/include/asm/preempt.h index deca3f221836..0cde7e240373 100644 --- a/arch/s390/include/asm/preempt.h +++ b/arch/s390/include/asm/preempt.h @@ -5,6 +5,7 @@ #include <asm/current.h> #include <linux/thread_info.h> #include <asm/atomic_ops.h> +#include <asm/cmpxchg.h> #include <asm/march.h> #ifdef MARCH_HAS_Z196_FEATURES @@ -22,12 +23,10 @@ static __always_inline void preempt_count_set(int pc) { int old, new; + old = READ_ONCE(get_lowcore()->preempt_count); do { - old = READ_ONCE(get_lowcore()->preempt_count); - new = (old & PREEMPT_NEED_RESCHED) | - (pc & ~PREEMPT_NEED_RESCHED); - } while (__atomic_cmpxchg(&get_lowcore()->preempt_count, - old, new) != old); + new = (old & PREEMPT_NEED_RESCHED) | (pc & ~PREEMPT_NEED_RESCHED); + } while (!arch_try_cmpxchg(&get_lowcore()->preempt_count, &old, new)); } static __always_inline void set_preempt_need_resched(void) |