1 files changed, 7 insertions, 16 deletions

diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 985721a1264c..a835a1a53826 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -55,16 +55,19 @@ static void dump_backtrace_entry(unsigned long where)
         printk(" %pS\n", (void *)where);
 }
 
-static void __dump_instr(const char *lvl, struct pt_regs *regs)
+static void dump_kernel_instr(const char *lvl, struct pt_regs *regs)
 {
         unsigned long addr = instruction_pointer(regs);
         char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;
         int i;
 
+        if (user_mode(regs))
+                return;
+
         for (i = -4; i < 1; i++) {
                 unsigned int val, bad;
 
-                bad = get_user(val, &((u32 *)addr)[i]);
+                bad = aarch64_insn_read(&((u32 *)addr)[i], &val);
 
                 if (!bad)
                         p += sprintf(p, i == 0 ? "(%08x) " : "%08x ", val);
@@ -73,19 +76,8 @@ static void __dump_instr(const char *lvl, struct pt_regs *regs)
                         break;
                 }
         }
-        printk("%sCode: %s\n", lvl, str);
-}
 
-static void dump_instr(const char *lvl, struct pt_regs *regs)
-{
-        if (!user_mode(regs)) {
-                mm_segment_t fs = get_fs();
-                set_fs(KERNEL_DS);
-                __dump_instr(lvl, regs);
-                set_fs(fs);
-        } else {
-                __dump_instr(lvl, regs);
-        }
+        printk("%sCode: %s\n", lvl, str);
 }
 
 void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
@@ -171,8 +163,7 @@ static int __die(const char *str, int err, struct pt_regs *regs)
         print_modules();
         show_regs(regs);
 
-        if (!user_mode(regs))
-                dump_instr(KERN_EMERG, regs);
+        dump_kernel_instr(KERN_EMERG, regs);
 
         return ret;
 }