On Thu, Apr 14, 2022 at 03:02:11PM -0700, Palmer Dabbelt wrote: > From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > > We have no indications that openrisc meets the qspinlock requirements, > so move to ticket-spinlock as that is more likey to be correct. > > Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> > Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx> > --- > arch/openrisc/Kconfig | 1 - > arch/openrisc/include/asm/Kbuild | 5 ++-- > arch/openrisc/include/asm/spinlock.h | 27 ---------------------- > arch/openrisc/include/asm/spinlock_types.h | 7 ------ > 4 files changed, 2 insertions(+), 38 deletions(-) > delete mode 100644 arch/openrisc/include/asm/spinlock.h > delete mode 100644 arch/openrisc/include/asm/spinlock_types.h > > diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig > index 0d68adf6e02b..99f0e4a4cbbd 100644 > --- a/arch/openrisc/Kconfig > +++ b/arch/openrisc/Kconfig > @@ -30,7 +30,6 @@ config OPENRISC > select HAVE_DEBUG_STACKOVERFLOW > select OR1K_PIC > select CPU_NO_EFFICIENT_FFS if !OPENRISC_HAVE_INST_FF1 > - select ARCH_USE_QUEUED_SPINLOCKS > select ARCH_USE_QUEUED_RWLOCKS > select OMPIC if SMP > select ARCH_WANT_FRAME_POINTERS > diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild > index ca5987e11053..3386b9c1c073 100644 > --- a/arch/openrisc/include/asm/Kbuild > +++ b/arch/openrisc/include/asm/Kbuild > @@ -1,9 +1,8 @@ > # SPDX-License-Identifier: GPL-2.0 > generic-y += extable.h > generic-y += kvm_para.h > -generic-y += mcs_spinlock.h > -generic-y += qspinlock_types.h > -generic-y += qspinlock.h > +generic-y += spinlock_types.h > +generic-y += spinlock.h > generic-y += qrwlock_types.h > generic-y += qrwlock.h > generic-y += user.h > diff --git a/arch/openrisc/include/asm/spinlock.h b/arch/openrisc/include/asm/spinlock.h > deleted file mode 100644 > index 264944a71535..000000000000 > --- a/arch/openrisc/include/asm/spinlock.h > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-or-later */ > -/* > - * OpenRISC Linux > - * > - * Linux architectural port borrowing liberally from similar works of > - * others. All original copyrights apply as per the original source > - * declaration. > - * > - * OpenRISC implementation: > - * Copyright (C) 2003 Matjaz Breskvar <phoenix@xxxxxxxxx> > - * Copyright (C) 2010-2011 Jonas Bonn <jonas@xxxxxxxxxxxx> > - * et al. > - */ > - > -#ifndef __ASM_OPENRISC_SPINLOCK_H > -#define __ASM_OPENRISC_SPINLOCK_H > - > -#include <asm/qspinlock.h> > - > -#include <asm/qrwlock.h> > - > -#define arch_spin_relax(lock) cpu_relax() > -#define arch_read_relax(lock) cpu_relax() > -#define arch_write_relax(lock) cpu_relax() > - > - > -#endif > diff --git a/arch/openrisc/include/asm/spinlock_types.h b/arch/openrisc/include/asm/spinlock_types.h > deleted file mode 100644 > index 7c6fb1208c88..000000000000 > --- a/arch/openrisc/include/asm/spinlock_types.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -#ifndef _ASM_OPENRISC_SPINLOCK_TYPES_H > -#define _ASM_OPENRISC_SPINLOCK_TYPES_H > - > -#include <asm/qspinlock_types.h> > -#include <asm/qrwlock_types.h> > - > -#endif /* _ASM_OPENRISC_SPINLOCK_TYPES_H */ Thanks for this, a bit late but. Acked-by: Stafford Horne <shorne@xxxxxxxxx>
