Commit 162f33dd authored by Dmitry V. Levin's avatar Dmitry V. Levin Committed by Paul Moore
Browse files

Move EM_ARCOMPACT and EM_ARCV2 to uapi/linux/elf-em.h 



These should never have been defined in the arch tree to begin with, and
now uapi/linux/audit.h header is going to use EM_ARCOMPACT and EM_ARCV2
in order to define AUDIT_ARCH_ARCOMPACT and AUDIT_ARCH_ARCV2 which are
needed to implement syscall_get_arch() which in turn is required to
extend the generic ptrace API with PTRACE_GET_SYSCALL_INFO request.

Acked-by: default avatarVineet Gupta <vgupta@synopsys.com>
Acked-by: default avatarPaul Moore <paul@paul-moore.com>
Cc: Elvira Khabirova <lineprinter@altlinux.org>
Cc: Eugene Syromyatnikov <esyr@redhat.com>
Cc: Alexey Brodkin <alexey.brodkin@synopsys.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Cc: linux-audit@redhat.com
Signed-off-by: default avatarDmitry V. Levin <ldv@altlinux.org>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 2efa48fe

arch/arc/include/asm/elf.h

+1 −5
Original line number Diff line number Diff line
@@ -10,13 +10,9 @@ 
#define __ASM_ARC_ELF_H



#include <linux/types.h>

#include <linux/elf-em.h>

#include <uapi/asm/elf.h>



/* These ELF defines belong to uapi but libc elf.h already defines them */

#define EM_ARCOMPACT		93



#define EM_ARCV2		195	/* ARCv2 Cores */



#define EM_ARC_INUSE		(IS_ENABLED(CONFIG_ISA_ARCOMPACT) ? \

					EM_ARCOMPACT : EM_ARCV2)

include/uapi/linux/elf-em.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define EM_M32R		88	/* Renesas M32R */

#define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */

#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */

#define EM_ARCOMPACT	93	/* ARCompact processor */

#define EM_XTENSA	94	/* Tensilica Xtensa Architecture */

#define EM_BLACKFIN     106     /* ADI Blackfin Processor */

#define EM_ALTERA_NIOS2	113	/* Altera Nios II soft-core processor */
@@ -42,6 +43,7 @@ 
#define EM_TILEPRO	188	/* Tilera TILEPro */

#define EM_MICROBLAZE	189	/* Xilinx MicroBlaze */

#define EM_TILEGX	191	/* Tilera TILE-Gx */

#define EM_ARCV2	195	/* ARCv2 Cores */

#define EM_RISCV	243	/* RISC-V */

#define EM_BPF		247	/* Linux BPF - in-kernel virtual machine */

#define EM_CSKY		252	/* C-SKY */

CRA Git | Maintained and supported by SUSTech CRA and CCSE