lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

riscv: cleanup <asm/bug.h>

Browse Source 
Remove various not required ifdefs and externs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Anup Patel <anup@brainfault.org>
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
This commit is contained in:
Christoph Hellwig 2019-10-17 19:37:29 +02:00 committed by Paul Walmsley
parent 9fe57d8c57
commit a6d9e26726
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/riscv/include/asm/bug.h
View File

@ -12,7 +12,6 @@
#include <asm/asm.h> #include <asm/asm.h>
#ifdef CONFIG_GENERIC_BUG
#define __INSN_LENGTH_MASK _UL(0x3) #define __INSN_LENGTH_MASK _UL(0x3)
#define __INSN_LENGTH_32 _UL(0x3) #define __INSN_LENGTH_32 _UL(0x3)
#define __COMPRESSED_INSN_MASK _UL(0xffff) #define __COMPRESSED_INSN_MASK _UL(0xffff)
@ -20,7 +19,6 @@
#define __BUG_INSN_32 _UL(0x00100073) /* ebreak */ #define __BUG_INSN_32 _UL(0x00100073) /* ebreak */
#define __BUG_INSN_16 _UL(0x9002) /* c.ebreak */ #define __BUG_INSN_16 _UL(0x9002) /* c.ebreak */
#ifndef __ASSEMBLY__
typedef u32 bug_insn_t; typedef u32 bug_insn_t;
#ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS #ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
@ -43,6 +41,7 @@ typedef u32 bug_insn_t;
RISCV_SHORT " %2" RISCV_SHORT " %2"
#endif #endif
#ifdef CONFIG_GENERIC_BUG
#define __BUG_FLAGS(flags) \ #define __BUG_FLAGS(flags) \
do { \ do { \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
@ -58,14 +57,10 @@ do { \
"i" (flags), \ "i" (flags), \
"i" (sizeof(struct bug_entry))); \ "i" (sizeof(struct bug_entry))); \
} while (0) } while (0)
#endif /* !__ASSEMBLY__ */
#else /* CONFIG_GENERIC_BUG */ #else /* CONFIG_GENERIC_BUG */
#ifndef __ASSEMBLY__
#define __BUG_FLAGS(flags) do { \ #define __BUG_FLAGS(flags) do { \
__asm__ __volatile__ ("ebreak\n"); \ __asm__ __volatile__ ("ebreak\n"); \
} while (0) } while (0)
#endif /* !__ASSEMBLY__ */
#endif /* CONFIG_GENERIC_BUG */ #endif /* CONFIG_GENERIC_BUG */
#define BUG() do { \ #define BUG() do { \
@ -79,15 +74,10 @@ do { \
#include <asm-generic/bug.h> #include <asm-generic/bug.h>
#ifndef __ASSEMBLY__
struct pt_regs; struct pt_regs;
struct task_struct; struct task_struct;
extern void die(struct pt_regs *regs, const char *str); void die(struct pt_regs *regs, const char *str);
extern void do_trap(struct pt_regs *regs, int signo, int code, void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr);
unsigned long addr);
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_RISCV_BUG_H */ #endif /* _ASM_RISCV_BUG_H */