1 files changed, 8 insertions, 4 deletions

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 1aae78f775fc..1b81839b6c88 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -37,13 +37,16 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
                         const struct stacktrace_ops *ops,
                         struct thread_info *tinfo, int *graph)
 {
-        struct task_struct *task = tinfo->task;
+        struct task_struct *task;
         unsigned long ret_addr;
-        int index = task->curr_ret_stack;
+        int index;
 
         if (addr != (unsigned long)return_to_handler)
                 return;
 
+        task = tinfo->task;
+        index = task->curr_ret_stack;
+
         if (!task->ret_stack || index < *graph)
                 return;
 
@@ -252,7 +255,8 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
         unsigned short ss;
         unsigned long sp;
 #endif
-        printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
+        printk(KERN_DEFAULT
+               "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
         printk("PREEMPT ");
 #endif
@@ -264,7 +268,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
 #endif
         printk("\n");
         if (notify_die(DIE_OOPS, str, regs, err,
-                        current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)
+                        current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)
                 return 1;
 
         show_registers(regs);