z80: fix up some signal handling logic we broke
authorAlan Cox <alan@linux.intel.com>
Mon, 1 Oct 2018 12:37:57 +0000 (13:37 +0100)
committerAlan Cox <alan@linux.intel.com>
Mon, 1 Oct 2018 12:37:57 +0000 (13:37 +0100)
Kernel/lowlevel-z80.s

index 6e438b1..cd50970 100644 (file)
@@ -82,7 +82,7 @@ deliver_signals:
        ; Pending signal
        ld a, (U_DATA__U_CURSIG)
        or a
-       jr z, no_pending
+       ret z
 
 deliver_signals_2:
        ld l, a
@@ -120,14 +120,6 @@ deliver_signals_2:
        jp (hl)         ; return to user space. This will then return via
                        ; the return path handler passed in BC
 
-no_pending:
-       ld (_int_disabled),a    ; clear interrupt status
-       ei
-       .ifne Z80_MMU_HOOKS
-       call mmu_user
-       .endif
-       ret
-
 ;
 ;      Syscall signal return path
 ;