Skip to contentSkip to conversation

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

PATCH Applied Dmitry V. Levin 2 participants 2 messages Mar 17, 2019 – Mar 21, 2019

Subsystems (2)
exec and binfmt Synopsys ARC architecture
lore
Share & tools
lore

Dmitry V. Levin

author
#0 lore raw

PATCH v2 1/13 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 Vineet Gupta <[email protected]>
Acked-by Paul Moore <[email protected]>
Cc Elvira Khabirova <[email protected]>
Cc Eugene Syromyatnikov <[email protected]>
Cc Alexey Brodkin <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Dmitry V. Levin <[email protected]>

---

Notes:
v2: unchanged

 arch/arc/include/asm/elf.h  | 6 +-----
 include/uapi/linux/elf-em.h | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)
arch/arc/include/asm/elf.h +1 -5
index aa2d6da9d187..2b80c184c9c8 100644
@@ -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
index 0c3000faedba..081675ed89cb 100644
@@ -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 */
Signature · 1 line
ldv
Applied
#1 lore raw
Quoted 17 lines · Dmitry V. Levin

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 Vineet Gupta <[email protected]>
Acked-by Paul Moore <[email protected]>
Cc Elvira Khabirova <[email protected]>
Cc Eugene Syromyatnikov <[email protected]>
Cc Alexey Brodkin <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Dmitry V. Levin <[email protected]>
Quoted 8 lines

---

Notes:
v2: unchanged

 arch/arc/include/asm/elf.h  | 6 +-----
 include/uapi/linux/elf-em.h | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

Merged into audit/next, thanks everyone.

Signature · 2 lines
paul moore
www.paul-moore.com