---

yaml
---
r: 167371
b: refs/heads/master
c: 03a6e5b
h: refs/heads/master
i:
  167369: 5f91169
  167367: bf925bf
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e40c2ec6761d11043ad9f6352679049dbee836eb
+refs/heads/master: 03a6e5bd5ba7d2a37b0bf4327b83d7c83311b0a1

trunk/arch/arm/kernel/traps.c

@@ -231,6 +231,7 @@ static void __die(const char *str, int err, struct thread_info *thread, struct p
 
 	printk(KERN_EMERG "Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n",
 	       str, err, ++die_counter);
+	sysfs_printk_last_file();
 	print_modules();
 	__show_regs(regs);
 	printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
@@ -255,21 +256,21 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
 
 	oops_enter();
 
-	console_verbose();
 	spin_lock_irq(&die_lock);
+	console_verbose();
 	bust_spinlocks(1);
 	__die(str, err, thread, regs);
 	bust_spinlocks(0);
 	add_taint(TAINT_DIE);
 	spin_unlock_irq(&die_lock);
+	oops_exit();
 
 	if (in_interrupt())
 		panic("Fatal exception in interrupt");
 
 	if (panic_on_oops)
 		panic("Fatal exception");
 
-	oops_exit();
 	do_exit(SIGSEGV);
 }