Commit f62b7626 authored by Jun Yi's avatar Jun Yi Committed by Huacai Chen
Browse files

LoongArch: Remove useless header compiler.h 



The content of LoongArch's compiler.h is trivial, with some unused
anywhere, so inline the definitions and remove the header.

Signed-off-by: default avatarJun Yi <yijun@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent ab6e57a6

arch/loongarch/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ config LOONGARCH 
	select GENERIC_TIME_VSYSCALL

	select GPIOLIB

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_COMPILER_H

	select HAVE_ARCH_MMAP_RND_BITS if MMU

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

arch/loongarch/include/asm/atomic.h

+4 −9
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/types.h>

#include <asm/barrier.h>

#include <asm/cmpxchg.h>

#include <asm/compiler.h>



#if __SIZEOF_LONG__ == 4

#define __LL		"ll.w	"
@@ -163,8 +162,7 @@ static inline int arch_atomic_sub_if_positive(int i, atomic_t *v) 
		"	beqz	%1, 1b					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		: "=&r" (result), "=&r" (temp),

		  "+" GCC_OFF_SMALL_ASM() (v->counter)

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "I" (-i));

	} else {

		__asm__ __volatile__(
@@ -176,8 +174,7 @@ static inline int arch_atomic_sub_if_positive(int i, atomic_t *v) 
		"	beqz	%1, 1b					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		: "=&r" (result), "=&r" (temp),

		  "+" GCC_OFF_SMALL_ASM() (v->counter)

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "r" (i));

	}
@@ -326,8 +323,7 @@ static inline long arch_atomic64_sub_if_positive(long i, atomic64_t *v) 
		"	beqz	%1, 1b					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		: "=&r" (result), "=&r" (temp),

		  "+" GCC_OFF_SMALL_ASM() (v->counter)

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "I" (-i));

	} else {

		__asm__ __volatile__(
@@ -339,8 +335,7 @@ static inline long arch_atomic64_sub_if_positive(long i, atomic64_t *v) 
		"	beqz	%1, 1b					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		: "=&r" (result), "=&r" (temp),

		  "+" GCC_OFF_SMALL_ASM() (v->counter)

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "r" (i));

	}

arch/loongarch/include/asm/compiler.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2020-2022 Loongson Technology Corporation Limited

 */

#ifndef _ASM_COMPILER_H

#define _ASM_COMPILER_H



#define GCC_OFF_SMALL_ASM() "ZC"



#define LOONGARCH_ISA_LEVEL "loongarch"

#define LOONGARCH_ISA_ARCH_LEVEL "arch=loongarch"

#define LOONGARCH_ISA_LEVEL_RAW loongarch

#define LOONGARCH_ISA_ARCH_LEVEL_RAW LOONGARCH_ISA_LEVEL_RAW



#endif /* _ASM_COMPILER_H */

arch/loongarch/include/asm/futex.h

+2 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/futex.h>

#include <linux/uaccess.h>

#include <asm/barrier.h>

#include <asm/compiler.h>

#include <asm/errno.h>



#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg)		\
@@ -95,8 +94,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, u32 newv 
	"	"__UA_ADDR "\t1b, 4b				\n"

	"	"__UA_ADDR "\t2b, 4b				\n"

	"	.previous					\n"

	: "+r" (ret), "=&r" (val), "=" GCC_OFF_SMALL_ASM() (*uaddr)

	: GCC_OFF_SMALL_ASM() (*uaddr), "Jr" (oldval), "Jr" (newval),

	: "+r" (ret), "=&r" (val), "=ZC" (*uaddr)

	: "ZC" (*uaddr), "Jr" (oldval), "Jr" (newval),

	  "i" (-EFAULT)

	: "memory", "t0");

arch/loongarch/include/asm/irqflags.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/compiler.h>

#include <linux/stringify.h>

#include <asm/compiler.h>

#include <asm/loongarch.h>



static inline void arch_local_irq_enable(void)