diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-11-29 17:55:13 -0800 |
|---|---|---|
| committer |   Palmer Dabbelt <palmer@sifive.com> | 2017-11-30 10:01:10 -0800 |
| commit | 5e6f82b0fe7b7b4a204efeb0817fb8b0a2bc0373 (patch) | |
| tree | bd78cace78954860c16b2407b3736d7a3472b87f /arch/riscv/include/asm/bug.h | |
| parent | RISC-V: use generic serial.h (diff) | |
| download | linux-dev-5e6f82b0fe7b7b4a204efeb0817fb8b0a2bc0373.tar.xz linux-dev-5e6f82b0fe7b7b4a204efeb0817fb8b0a2bc0373.zip | |
RISC-V: use RISCV_{INT,SHORT} instead of {INT,SHORT} for asm macros
INT and SHORT are used by some drivers that pull in the include files,
so prefixing helps avoid namespace conflicts. Other constructs in the
same file already uses this.
Fixes, among others, these warnings with allmodconfig:
../sound/core/pcm_misc.c:43:0: warning: "INT" redefined
#define INT __force int
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/riscv/include/asm/bug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/riscv/include/asm/bug.h b/arch/riscv/include/asm/bug.h index c3e13764a943..bfc7f099ab1f 100644 --- a/arch/riscv/include/asm/bug.h +++ b/arch/riscv/include/asm/bug.h @@ -27,8 +27,8 @@ typedef u32 bug_insn_t; #ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS -#define __BUG_ENTRY_ADDR INT " 1b - 2b" -#define __BUG_ENTRY_FILE INT " %0 - 2b" +#define __BUG_ENTRY_ADDR RISCV_INT " 1b - 2b" +#define __BUG_ENTRY_FILE RISCV_INT " %0 - 2b" #else #define __BUG_ENTRY_ADDR RISCV_PTR " 1b" #define __BUG_ENTRY_FILE RISCV_PTR " %0" @@ -38,7 +38,7 @@ typedef u32 bug_insn_t; #define __BUG_ENTRY \ __BUG_ENTRY_ADDR "\n\t" \ __BUG_ENTRY_FILE "\n\t" \ - SHORT " %1" + RISCV_SHORT " %1" #else #define __BUG_ENTRY \ __BUG_ENTRY_ADDR |