From abcde7b0c4813d1331aac77a6b4840c3a61db16a Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 24 Sep 2012 08:22:00 +0200
Subject: [PATCH] --- yaml --- r: 324118 b: refs/heads/master c:
 022912575ce3135517ec1cbfb8d4b240e0821feb h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/traps.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index efeb3528df62..3a86a1dbf4ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e249d6e11bd92161d2dcb92691b0a6ec361627a
+refs/heads/master: 022912575ce3135517ec1cbfb8d4b240e0821feb
diff --git a/trunk/arch/s390/kernel/traps.c b/trunk/arch/s390/kernel/traps.c
index befc761fc154..3d2b0fa37db0 100644
--- a/trunk/arch/s390/kernel/traps.c
+++ b/trunk/arch/s390/kernel/traps.c
@@ -231,7 +231,6 @@ void show_registers(struct pt_regs *regs)
 
 void show_regs(struct pt_regs *regs)
 {
-	print_modules();
 	printk("CPU: %d %s %s %.*s\n",
 	       task_thread_info(current)->cpu, print_tainted(),
 	       init_utsname()->release,
@@ -271,6 +270,7 @@ void die(struct pt_regs *regs, const char *str)
 #endif
 	printk("\n");
 	notify_die(DIE_OOPS, str, regs, 0, regs->int_code & 0xffff, SIGSEGV);
+	print_modules();
 	show_regs(regs);
 	bust_spinlocks(0);
 	add_taint(TAINT_DIE);