diff options
| author | Palmer Dabbelt <palmer@sifive.com> | 2017-12-01 22:31:31 +0100 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@sifive.com> | 2017-12-01 22:31:31 +0100 |
| commit | 3b62de26cf5ef17340a0e986d3e53eb4f74f96d5 (patch) | |
| tree | 113b70a711d11fadb6f73d459a8d942f90e5e3fd /arch/riscv/include/asm/asm.h | |
| parent | move libgcc.h to include/linux (diff) | |
| parent | RISC-V: Add missing include (diff) | |
| download | linux-3b62de26cf5ef17340a0e986d3e53eb4f74f96d5.tar.xz linux-3b62de26cf5ef17340a0e986d3e53eb4f74f96d5.zip | |
RISC-V: Fixes for clean allmodconfig build
Olaf said: Here's a short series of patches that produces a working
allmodconfig. Would be nice to see them go in so we can add build
coverage.
I've dropped patches 8 and 10 from the original set:
* [PATCH 08/10] (RISC-V: Set __ARCH_WANT_RENAMEAT to pick up generic
version) has a better fix that I've sent out for review, we don't want
renameat.
* [PATCH 10/10] (input: joystick: riscv has get_cycles) has already been
taken into Dmitry Torokhov's tree.
Diffstat (limited to 'arch/riscv/include/asm/asm.h')
| -rw-r--r-- | arch/riscv/include/asm/asm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/riscv/include/asm/asm.h b/arch/riscv/include/asm/asm.h index 6cbbb6a68d76..5ad4cb622bed 100644 --- a/arch/riscv/include/asm/asm.h +++ b/arch/riscv/include/asm/asm.h @@ -58,17 +58,17 @@ #endif #if (__SIZEOF_INT__ == 4) -#define INT __ASM_STR(.word) -#define SZINT __ASM_STR(4) -#define LGINT __ASM_STR(2) +#define RISCV_INT __ASM_STR(.word) +#define RISCV_SZINT __ASM_STR(4) +#define RISCV_LGINT __ASM_STR(2) #else #error "Unexpected __SIZEOF_INT__" #endif #if (__SIZEOF_SHORT__ == 2) -#define SHORT __ASM_STR(.half) -#define SZSHORT __ASM_STR(2) -#define LGSHORT __ASM_STR(1) +#define RISCV_SHORT __ASM_STR(.half) +#define RISCV_SZSHORT __ASM_STR(2) +#define RISCV_LGSHORT __ASM_STR(1) #else #error "Unexpected __SIZEOF_SHORT__" #endif |