ARC: Fixup the current ABI version

The upstream kernel ABI (v3) is different from current out-of-tree (v2):
* no-legacy-syscalls
* user_regs_struct layout has changed

So we rev up the ABI version

Signed-off-by: Vineet Gupta <[email protected]>

diff --git a/arch/arc/include/asm/elf.h b/arch/arc/include/asm/elf.h
index 4d420055a71b822b978873d18e19eeeea79c519f..265d030a7aad6a2346b5092ff1f12fddf6441073 100644 (file)
--- a/arch/arc/include/asm/elf.h
+++ b/arch/arc/include/asm/elf.h
@@ -16,7 +16,7 @@
 /* Machine specific ELF Hdr flags */
 #define EF_ARC_OSABI_MSK       0x00000f00
 #define EF_ARC_OSABI_ORIG      0x00000000   /* MUST be zero for back-compat */
-#define EF_ARC_OSABI_V2                0x00000200
+#define EF_ARC_OSABI_CURRENT   0x00000300   /* v3 (no legacy syscalls) */
 
 /* ARC Relocations (kernel Modules only) */
 #define  R_ARC_32              0x4

diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c
index 279e080b6b541d068456644f725ac7eeaf77d819..0a7531d992945f5026c8aa747a61f58b6c12a54c 100644 (file)
--- a/arch/arc/kernel/process.c
+++ b/arch/arc/kernel/process.c
@@ -224,7 +224,7 @@ int elf_check_arch(const struct elf32_hdr *x)
                return 0;
 
        eflags = x->e_flags;
-       if ((eflags & EF_ARC_OSABI_MSK) < EF_ARC_OSABI_V2) {
+       if ((eflags & EF_ARC_OSABI_MSK) < EF_ARC_OSABI_CURRENT) {
                pr_err("ABI mismatch - you need newer toolchain\n");
                force_sigsegv(SIGSEGV, current);
                return 0;