diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2013-02-27 07:53:27 -0500 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2013-02-27 09:30:25 -0500 |
commit | 17139053eb96bc09a6d6248aae17c9316f5bcd86 (patch) | |
tree | a0dcb5245b3401a4aa879b05228d6a6930dd5932 /arch/arc | |
parent | 5dc99e50d2d66f8ddeb4e20af1908ad99db0cb98 (diff) |
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 <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc')
-rw-r--r-- | arch/arc/include/asm/elf.h | 2 | ||||
-rw-r--r-- | arch/arc/kernel/process.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/include/asm/elf.h b/arch/arc/include/asm/elf.h index 4d420055a71b..265d030a7aad 100644 --- a/arch/arc/include/asm/elf.h +++ b/arch/arc/include/asm/elf.h | |||
@@ -16,7 +16,7 @@ | |||
16 | /* Machine specific ELF Hdr flags */ | 16 | /* Machine specific ELF Hdr flags */ |
17 | #define EF_ARC_OSABI_MSK 0x00000f00 | 17 | #define EF_ARC_OSABI_MSK 0x00000f00 |
18 | #define EF_ARC_OSABI_ORIG 0x00000000 /* MUST be zero for back-compat */ | 18 | #define EF_ARC_OSABI_ORIG 0x00000000 /* MUST be zero for back-compat */ |
19 | #define EF_ARC_OSABI_V2 0x00000200 | 19 | #define EF_ARC_OSABI_CURRENT 0x00000300 /* v3 (no legacy syscalls) */ |
20 | 20 | ||
21 | /* ARC Relocations (kernel Modules only) */ | 21 | /* ARC Relocations (kernel Modules only) */ |
22 | #define R_ARC_32 0x4 | 22 | #define R_ARC_32 0x4 |
diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c index 279e080b6b54..0a7531d99294 100644 --- 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) | |||
224 | return 0; | 224 | return 0; |
225 | 225 | ||
226 | eflags = x->e_flags; | 226 | eflags = x->e_flags; |
227 | if ((eflags & EF_ARC_OSABI_MSK) < EF_ARC_OSABI_V2) { | 227 | if ((eflags & EF_ARC_OSABI_MSK) < EF_ARC_OSABI_CURRENT) { |
228 | pr_err("ABI mismatch - you need newer toolchain\n"); | 228 | pr_err("ABI mismatch - you need newer toolchain\n"); |
229 | force_sigsegv(SIGSEGV, current); | 229 | force_sigsegv(SIGSEGV, current); |
230 | return 0; | 230 | return 0; |