From eaa82034800c23c0d38fa8289330f130158cacd2 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 1 Oct 2018 13:41:26 +0100
Subject: [PATCH] soc280: update rest to new irq handling

---
 Kernel/platform-socz80/usermem.s | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Kernel/platform-socz80/usermem.s b/Kernel/platform-socz80/usermem.s
index 2f6037d3..53ce7bef 100644
--- a/Kernel/platform-socz80/usermem.s
+++ b/Kernel/platform-socz80/usermem.s
@@ -19,6 +19,10 @@
         .globl __uputw
         .globl __uzero
 
+	.globl _int_disabled
+
+	; FIXME: can we now get rid of the IRQ disables ?
+
         .area _CODE
 
 __uput:
@@ -28,7 +32,7 @@ __uput:
         ld ix, #0   ; load ix with stack pointer
         add ix, sp
         ; store interrupt state, disable interrupts
-        ld a, i
+        ld a, (_int_disabled)
         di
         push af
         ; load DE with destination address (in userspace)
@@ -51,7 +55,7 @@ __uputc:
         ld ix, #0   ; load ix with stack pointer
         add ix, sp
         ; store interrupt state, disable interrupts
-        ld a, i
+        ld a, (_int_disabled)
         di
         push af
         ; load DE with destination address (in userspace)
@@ -69,7 +73,7 @@ __uputw:
         ld ix, #0   ; load ix with stack pointer
         add ix, sp
         ; store interrupt state, disable interrupts
-        ld a, i
+        ld a, (_int_disabled)
         di
         push af
         ; load DE with destination address (in userspace)
@@ -89,7 +93,7 @@ __ugetc:
         ld ix, #0   ; load ix with stack pointer
         add ix, sp
         ; store interrupt state, disable interrupts
-        ld a, i
+        ld a, (_int_disabled)
         di
         push af
         ; load DE with source address (in userspace)
@@ -108,7 +112,7 @@ __ugetw:
         ld ix, #0   ; load ix with stack pointer
         add ix, sp
         ; store interrupt state, disable interrupts
-        ld a, i
+        ld a, (_int_disabled)
         di
         push af
         ; load DE with source address (in userspace)
@@ -122,7 +126,8 @@ __ugetw:
 ugetputret: ; this is shared with the other routines, above and below
         pop af
         pop ix
-        ret po
+	or a
+        ret nz
         ei
         ret
 
@@ -133,7 +138,7 @@ __uget:
         ld ix, #0   ; load ix with stack pointer
         add ix, sp
         ; store interrupt state, disable interrupts
-        ld a, i
+        ld a, (_int_disabled)
         di
         push af
         ; load DE with source address (in userspace)
@@ -186,7 +191,7 @@ __uzero:
         ld ix, #0
         add ix, sp
         ; store interrupt state, disable interrupts
-        ld a, i
+        ld a, (_int_disabled)
         di
         push af
         ; load DE with dest address (in userspace)
-- 
2.34.1