diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-09-24 02:22:00 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-09-26 09:45:27 -0400 |
| commit | 022912575ce3135517ec1cbfb8d4b240e0821feb (patch) | |
| tree | 6091e0207febe5eb27ded35de1a21ec7778f6593 | |
| parent | 5e249d6e11bd92161d2dcb92691b0a6ec361627a (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index befc761fc154..3d2b0fa37db0 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c | |||
| @@ -231,7 +231,6 @@ void show_registers(struct pt_regs *regs) | |||
| 231 | 231 | ||
| 232 | void show_regs(struct pt_regs *regs) | 232 | void show_regs(struct pt_regs *regs) |
| 233 | { | 233 | { |
| 234 | print_modules(); | ||
| 235 | printk("CPU: %d %s %s %.*s\n", | 234 | printk("CPU: %d %s %s %.*s\n", |
| 236 | task_thread_info(current)->cpu, print_tainted(), | 235 | task_thread_info(current)->cpu, print_tainted(), |
| 237 | init_utsname()->release, | 236 | init_utsname()->release, |
| @@ -271,6 +270,7 @@ void die(struct pt_regs *regs, const char *str) | |||
| 271 | #endif | 270 | #endif |
| 272 | printk("\n"); | 271 | printk("\n"); |
| 273 | notify_die(DIE_OOPS, str, regs, 0, regs->int_code & 0xffff, SIGSEGV); | 272 | notify_die(DIE_OOPS, str, regs, 0, regs->int_code & 0xffff, SIGSEGV); |
| 273 | print_modules(); | ||
| 274 | show_regs(regs); | 274 | show_regs(regs); |
| 275 | bust_spinlocks(0); | 275 | bust_spinlocks(0); |
| 276 | add_taint(TAINT_DIE); | 276 | add_taint(TAINT_DIE); |
