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);