Skip to contentSkip to conversation

Move EM_UNICORE to uapi/linux/elf-em.h

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

lore
Share & tools
lore

Dmitry V. Levin

author
#0 lore raw

PATCH v2 11/13 Move EM_UNICORE to uapi/linux/elf-em.h

This should never have been defined in the arch tree to begin with, and now uapi/linux/audit.h header is going to use EM_UNICORE in order to define AUDIT_ARCH_UNICORE which is 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 Paul Moore <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc Elvira Khabirova <[email protected]>
Cc Eugene Syromyatnikov <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc [email protected]
Signed-off-by Dmitry V. Levin <[email protected]>

---

Notes:
v2: unchanged

 arch/unicore32/include/asm/elf.h | 3 +--
 include/uapi/linux/elf-em.h      | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/unicore32/include/asm/elf.h +1 -2
index 829042d07722..ae66dc1be49e 100644
@@ -19,6 +19,7 @@
  * ELF register definitions..
  */
 #include <asm/ptrace.h>
+#include <linux/elf-em.h>
 
 typedef unsigned long elf_greg_t;
 typedef unsigned long elf_freg_t[3];

@@ -28,8 +29,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct fp_state elf_fpregset_t;
 
-#define EM_UNICORE		110
-
 #define R_UNICORE_NONE		0
 #define R_UNICORE_PC24		1
 #define R_UNICORE_ABS32		2
include/uapi/linux/elf-em.h +1 -0
index 4b8df722330e..f47e853546fa 100644
@@ -37,6 +37,7 @@
 #define EM_ARCOMPACT	93	/* ARCompact processor */
 #define EM_XTENSA	94	/* Tensilica Xtensa Architecture */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
+#define EM_UNICORE	110	/* UniCore-32 */
 #define EM_ALTERA_NIOS2	113	/* Altera Nios II soft-core processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
 #define EM_HEXAGON	164	/* QUALCOMM Hexagon */
Signature · 1 line
ldv
Applied
#1 lore raw
Quoted 15 lines · Dmitry V. Levin

This should never have been defined in the arch tree to begin with, and now uapi/linux/audit.h header is going to use EM_UNICORE in order to define AUDIT_ARCH_UNICORE which is 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 Paul Moore <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc Elvira Khabirova <[email protected]>
Cc Eugene Syromyatnikov <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc [email protected]
Signed-off-by Dmitry V. Levin <[email protected]>
Quoted 8 lines

---

Notes:
v2: unchanged

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

Merged into audit/next, thanks everyone.

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