diff options
| author | Edgar E. Iglesias <edgar.iglesias@petalogix.com> | 2011-08-23 23:16:15 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-10-14 12:24:31 +0200 |
| commit | 69515f8b957a4b1558d4726ffa6be2484e1dcb60 (patch) | |
| tree | 4c3212f3489341df851a04853027f4f32723f139 /arch/microblaze | |
| parent | 0fb2a6f283f25731217841f961cefa0a19bd449d (diff) | |
| download | blackbird-op-linux-69515f8b957a4b1558d4726ffa6be2484e1dcb60.tar.gz blackbird-op-linux-69515f8b957a4b1558d4726ffa6be2484e1dcb60.zip | |
microblaze: Switch ELF_ARCH code to 189
Switch arch code to 189, the registered code in the upstream
version of binutils. Continue to accept the experimental 0xbaab.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/elf.h | 8 | ||||
| -rw-r--r-- | arch/microblaze/kernel/ptrace.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/elf.h b/arch/microblaze/include/asm/elf.h index 098dfdde4b06..834849f59ae8 100644 --- a/arch/microblaze/include/asm/elf.h +++ b/arch/microblaze/include/asm/elf.h @@ -16,13 +16,15 @@ * I've snaffled the value from the microblaze binutils source code * /binutils/microblaze/include/elf/microblaze.h */ -#define EM_XILINX_MICROBLAZE 0xbaab -#define ELF_ARCH EM_XILINX_MICROBLAZE +#define EM_MICROBLAZE 189 +#define EM_MICROBLAZE_OLD 0xbaab +#define ELF_ARCH EM_MICROBLAZE /* * This is used to ensure we don't load something for the wrong architecture. */ -#define elf_check_arch(x) ((x)->e_machine == EM_XILINX_MICROBLAZE) +#define elf_check_arch(x) ((x)->e_machine == EM_MICROBLAZE \ + || (x)->e_machine == EM_MICROBLAZE_OLD) /* * These are used to set parameters in the core dumps. diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c index 6a8e0cc5c57d..043cb58f9c44 100644 --- a/arch/microblaze/kernel/ptrace.c +++ b/arch/microblaze/kernel/ptrace.c @@ -148,7 +148,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) ret = -1L; if (unlikely(current->audit_context)) - audit_syscall_entry(EM_XILINX_MICROBLAZE, regs->r12, + audit_syscall_entry(EM_MICROBLAZE, regs->r12, regs->r5, regs->r6, regs->r7, regs->r8); |
