diff --git a/[refs] b/[refs] index ee286b5c366c..655af63905d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dc99e50d2d66f8ddeb4e20af1908ad99db0cb98 +refs/heads/master: 17139053eb96bc09a6d6248aae17c9316f5bcd86 diff --git a/trunk/arch/arc/include/asm/elf.h b/trunk/arch/arc/include/asm/elf.h index 4d420055a71b..265d030a7aad 100644 --- a/trunk/arch/arc/include/asm/elf.h +++ b/trunk/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/trunk/arch/arc/kernel/process.c b/trunk/arch/arc/kernel/process.c index 279e080b6b54..0a7531d99294 100644 --- a/trunk/arch/arc/kernel/process.c +++ b/trunk/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;