From 93f4fd4345a782d0ea101ed9b4b3fea78fdc4984 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Thu, 20 Oct 2016 17:46:23 +0100
Subject: [PATCH] 68000: Fix irqrestore handler and tidy some logging

---
 Kernel/lowlevel-68000.S | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Kernel/lowlevel-68000.S b/Kernel/lowlevel-68000.S
index f702a189..9b5d23b7 100644
--- a/Kernel/lowlevel-68000.S
+++ b/Kernel/lowlevel-68000.S
@@ -411,7 +411,7 @@ ei:
 irqrestore:
 		move.w sr,d0
 		and.w #$F8FF,d0
-		or.w 4(sp),d0
+		or.w 6(sp),d0
 		move.w d0,sr
 		rts
 
@@ -642,6 +642,8 @@ sig_or_die:
 		bsr outcharhex
 		lea panic_sig,a0
 		bsr outstring
+		move.l 2(sp),a0
+		bsr outa0hex
 		move.w #15,d2
 stackout:
 		move.l (sp)+,a0
@@ -651,7 +653,9 @@ stackout:
 		dbra d2,stackout
 		move.l #panic_sig2,-(sp)
 		bsr panic			; won't return
-panic_sig:	ascii ": signal in kernel mode."
+
+panic_sig:	ascii ": signal in kernel mode @"
+		byte 0
 crnl:
 		byte 13,10,0
 panic_sig2:	asciz "ksig"
-- 
2.34.1