From: Guo Ren <guoren@xxxxxxxxxxxxxxxxx> There is no difference between csky and generic, so use the generic header. Signed-off-by: Guo Ren <guoren@xxxxxxxxxxxxxxxxx> Signed-off-by: Guo Ren <guoren@xxxxxxxxxx> --- arch/csky/include/asm/Kbuild | 2 ++ arch/csky/include/asm/spinlock.h | 12 ------------ arch/csky/include/asm/spinlock_types.h | 9 --------- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 arch/csky/include/asm/spinlock.h delete mode 100644 arch/csky/include/asm/spinlock_types.h diff --git a/arch/csky/include/asm/Kbuild b/arch/csky/include/asm/Kbuild index 1117c28cb7e8..c08050fc0cce 100644 --- a/arch/csky/include/asm/Kbuild +++ b/arch/csky/include/asm/Kbuild @@ -7,6 +7,8 @@ generic-y += mcs_spinlock.h generic-y += qrwlock.h generic-y += qrwlock_types.h generic-y += qspinlock.h +generic-y += spinlock_types.h +generic-y += spinlock.h generic-y += parport.h generic-y += user.h generic-y += vmlinux.lds.h diff --git a/arch/csky/include/asm/spinlock.h b/arch/csky/include/asm/spinlock.h deleted file mode 100644 index 83a2005341f5..000000000000 --- a/arch/csky/include/asm/spinlock.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef __ASM_CSKY_SPINLOCK_H -#define __ASM_CSKY_SPINLOCK_H - -#include <asm/qspinlock.h> -#include <asm/qrwlock.h> - -/* See include/linux/spinlock.h */ -#define smp_mb__after_spinlock() smp_mb() - -#endif /* __ASM_CSKY_SPINLOCK_H */ diff --git a/arch/csky/include/asm/spinlock_types.h b/arch/csky/include/asm/spinlock_types.h deleted file mode 100644 index 75bdf3af80ba..000000000000 --- a/arch/csky/include/asm/spinlock_types.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef __ASM_CSKY_SPINLOCK_TYPES_H -#define __ASM_CSKY_SPINLOCK_TYPES_H - -#include <asm-generic/qspinlock_types.h> -#include <asm-generic/qrwlock_types.h> - -#endif /* __ASM_CSKY_SPINLOCK_TYPES_H */ -- 2.36.1
