3 files changed, 12 insertions, 1 deletions

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index efde6e178f6c..cd959c0b2e16 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -475,6 +475,7 @@ pgm_check_handler:
 pgm_no_vtime:
 #endif
         lg      %r9,__LC_THREAD_INFO    # load pointer to thread_info struct
+        mvc     SP_ARGS(8,%r15),__LC_LAST_BREAK
         TRACE_IRQS_OFF
         lgf     %r3,__LC_PGM_ILC        # load program interruption code
         lghi    %r8,0x7f
@@ -847,6 +848,7 @@ stack_overflow:
         je      0f
         la      %r1,__LC_SAVE_AREA+32
 0:      mvc     SP_R12(32,%r15),0(%r1)  # move %r12-%r15 to stack
+        mvc     SP_ARGS(8,%r15),__LC_LAST_BREAK
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) # clear back chain
         la      %r2,SP_PTREGS(%r15)     # load pt_regs
         jg      kernel_stack_overflow
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index dbefd0db395f..c1aff194141d 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -195,6 +195,7 @@ void show_regs(struct pt_regs *regs)
         /* Show stack backtrace if pt_regs is from kernel mode */
         if (!(regs->psw.mask & PSW_MASK_PSTATE))
                 show_trace(NULL, (unsigned long *) regs->gprs[15]);
+        show_last_breaking_event(regs);
 }
 
 extern void kernel_thread_starter(void);
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index b3524134f213..57b607b61100 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -134,7 +134,6 @@ void show_trace(struct task_struct *task, unsigned long *stack)
         else
                 __show_trace(sp, S390_lowcore.thread_info,
                              S390_lowcore.thread_info + THREAD_SIZE);
-        printk("\n");
         if (!task)
                 task = current;
         debug_show_held_locks(task);
@@ -162,6 +161,15 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         show_trace(task, sp);
 }
 
+#ifdef CONFIG_64BIT
+void show_last_breaking_event(struct pt_regs *regs)
+{
+        printk("Last Breaking-Event-Address:\n");
+        printk(" [<%016lx>] ", regs->args[0] & PSW_ADDR_INSN);
+        print_symbol("%s\n", regs->args[0] & PSW_ADDR_INSN);
+}
+#endif
+
 /*
  * The architecture-independent dump_stack generator
  */