Unverified Commit 205bf39a authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Palmer Dabbelt
Browse files

openrisc: Move to ticket-spinlock 



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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarStafford Horne <shorne@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 493e2ba2

arch/openrisc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/openrisc/include/asm/Kbuild

+2 −3
Original line number Diff line number Diff line 
# 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

arch/openrisc/include/asm/spinlock.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/* 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@bsemi.com>

 * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>

 * 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

arch/openrisc/include/asm/spinlock_types.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#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 */