lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

microblaze: Switch ELF_ARCH code to 189

Browse Source 
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>
This commit is contained in:
Edgar E. Iglesias
2011-08-23 23:16:15 +02:00
committed by Michal Simek
parent 0fb2a6f283
commit 69515f8b95
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/microblaze/include/asm/elf.h
View File

@@ -16,13 +16,15 @@
* I've snaffled the value from the microblaze binutils source code * I've snaffled the value from the microblaze binutils source code
* /binutils/microblaze/include/elf/microblaze.h * /binutils/microblaze/include/elf/microblaze.h
*/ */
#define EM_XILINX_MICROBLAZE 0xbaab #define EM_MICROBLAZE 189
#define ELF_ARCH EM_XILINX_MICROBLAZE #define EM_MICROBLAZE_OLD 0xbaab
#define ELF_ARCH EM_MICROBLAZE
/* /*
* This is used to ensure we don't load something for the wrong architecture. * 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. * These are used to set parameters in the core dumps.

2
arch/microblaze/kernel/ptrace.c
View File

@@ -148,7 +148,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
ret = -1L; ret = -1L;
if (unlikely(current->audit_context)) 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->r5, regs->r6,
regs->r7, regs->r8); regs->r7, regs->r8);