diff options
author | Palmer Dabbelt <palmer@sifive.com> | 2018-06-25 13:23:12 -0700 |
---|---|---|
committer | Palmer Dabbelt <palmer@sifive.com> | 2018-10-31 12:13:47 -0700 |
commit | 9b4789eacb654b7bbc806c831bcebd799ae0e2f5 (patch) | |
tree | dbda4cbb7b3f7e08c9ba7b6d997d5eaf5fc5c27a | |
parent | 732e8e4130ffccb618390e0f80a884543e61fd61 (diff) | |
download | linux-stable-9b4789eacb654b7bbc806c831bcebd799ae0e2f5.tar.gz linux-stable-9b4789eacb654b7bbc806c831bcebd799ae0e2f5.tar.bz2 linux-stable-9b4789eacb654b7bbc806c831bcebd799ae0e2f5.zip |
Move EM_RISCV into elf-em.h
This should never have been inside our arch port to begin with, it's
just a relic from when we were maintaining out of tree patches.
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Paul Walmsley <paul.walmsley@sifive.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-rw-r--r-- | arch/riscv/include/asm/elf.h | 3 | ||||
-rw-r--r-- | include/uapi/linux/elf-em.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h index a1ef503d616e..697fc23b0d5a 100644 --- a/arch/riscv/include/asm/elf.h +++ b/arch/riscv/include/asm/elf.h @@ -16,9 +16,6 @@ #include <asm/auxvec.h> #include <asm/byteorder.h> -/* TODO: Move definition into include/uapi/linux/elf-em.h */ -#define EM_RISCV 0xF3 - /* * These are used to set parameters in the core dumps. */ diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h index 31aa10178335..93722e60204c 100644 --- a/include/uapi/linux/elf-em.h +++ b/include/uapi/linux/elf-em.h @@ -41,6 +41,7 @@ #define EM_TILEPRO 188 /* Tilera TILEPro */ #define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */ #define EM_TILEGX 191 /* Tilera TILE-Gx */ +#define EM_RISCV 243 /* RISC-V */ #define EM_BPF 247 /* Linux BPF - in-kernel virtual machine */ #define EM_FRV 0x5441 /* Fujitsu FR-V */ |