diff options
| author | Helge Deller <deller@gmx.de> | 2020-07-28 18:49:45 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2020-07-28 18:49:45 +0200 |
| commit | 3d05b8aebc5f10ee3ab129b61100196855dd7249 (patch) | |
| tree | 142d29a642b6900915a930d8e0caa93b5260595b | |
| parent | 693a06543379709a7c20a9a6d04f005cf00572f9 (diff) | |
Revert "parisc: Improve interrupt handling in arch_spin_lock_flags()"
This reverts commit 2772f0efd5bbd5413db3d22e363b779ca0fa5310.
It turns out that we want to implement the spinlock code differently.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # v5.7+
| -rw-r--r-- | arch/parisc/include/asm/spinlock.h | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h index 70fecb8dc4e2..d2a3337599fb 100644 --- a/arch/parisc/include/asm/spinlock.h +++ b/arch/parisc/include/asm/spinlock.h @@ -10,34 +10,25 @@ static inline int arch_spin_is_locked(arch_spinlock_t *x) { volatile unsigned int *a = __ldcw_align(x); - smp_mb(); return *a == 0; } -static inline void arch_spin_lock(arch_spinlock_t *x) -{ - volatile unsigned int *a; - - a = __ldcw_align(x); - while (__ldcw(a) == 0) - while (*a == 0) - cpu_relax(); -} +#define arch_spin_lock(lock) arch_spin_lock_flags(lock, 0) static inline void arch_spin_lock_flags(arch_spinlock_t *x, unsigned long flags) { volatile unsigned int *a; - unsigned long flags_dis; a = __ldcw_align(x); - while (__ldcw(a) == 0) { - local_save_flags(flags_dis); - local_irq_restore(flags); + while (__ldcw(a) == 0) while (*a == 0) - cpu_relax(); - local_irq_restore(flags_dis); - } + if (flags & PSW_SM_I) { + local_irq_enable(); + cpu_relax(); + local_irq_disable(); + } else + cpu_relax(); } #define arch_spin_lock_flags arch_spin_lock_flags |