From mboxrd@z Thu Jan 1 00:00:00 1970 From: Palmer Dabbelt Subject: [PATCH 1/2] Move EM_RISCV into elf-em.h Date: Wed, 24 Oct 2018 13:40:35 -0700 Message-ID: <20181024204036.8799-2-palmer@sifive.com> References: <20181024204036.8799-1-palmer@sifive.com> Return-path: In-Reply-To: <20181024204036.8799-1-palmer@sifive.com> Sender: linux-kernel-owner@vger.kernel.org Cc: Palmer Dabbelt , aou@eecs.berkeley.edu, paul@paul-moore.com, eparis@redhat.com, keescook@chromium.org, luto@amacapital.net, wad@chromium.org, Wesley Terpstra , dhowells@redhat.com, tglx@linutronix.de, pombredanne@nexb.com, Greg KH , kstewart@linuxfoundation.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-audit@redhat.com, david.abdurachmanov@gmail.comlinux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com 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. Signed-off-by: Palmer Dabbelt --- arch/riscv/include/asm/elf.h | 3 --- include/uapi/linux/elf-em.h | 1 + 2 files changed, 1 insertion(+), 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 #include -/* 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 */ -- 2.18.1