summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-09-24 08:22:00 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:45:27 +0200
commit022912575ce3135517ec1cbfb8d4b240e0821feb (patch)
tree6091e0207febe5eb27ded35de1a21ec7778f6593
parent5e249d6e11bd92161d2dcb92691b0a6ec361627a (diff)
downloadop-kernel-dev-022912575ce3135517ec1cbfb8d4b240e0821feb.zip
op-kernel-dev-022912575ce3135517ec1cbfb8d4b240e0821feb.tar.gz
s390/traps: move call to print_modules() out of show_regs()
Same as 0fa0e2f0 "x86: Move call to print_modules() out of show_regs()". Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index befc761..3d2b0fa3 100644
--- a/arch/s390/kernel/traps.c
+++ b/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);
OpenPOWER on IntegriCloud