diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/s390/kernel/entry64.S | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'arch/s390/kernel/entry64.S')
-rw-r--r-- | arch/s390/kernel/entry64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index 7b9b4a2ba1d7..4eb71ffcf484 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
@@ -283,7 +283,7 @@ sysc_sigpending: | |||
283 | jo sysc_restart | 283 | jo sysc_restart |
284 | tm __TI_flags+7(%r9),_TIF_SINGLE_STEP | 284 | tm __TI_flags+7(%r9),_TIF_SINGLE_STEP |
285 | jo sysc_singlestep | 285 | jo sysc_singlestep |
286 | j sysc_leave # out of here, do NOT recheck | 286 | j sysc_work_loop |
287 | 287 | ||
288 | # | 288 | # |
289 | # _TIF_RESTART_SVC is set, set up registers and restart svc | 289 | # _TIF_RESTART_SVC is set, set up registers and restart svc |
@@ -684,7 +684,7 @@ io_sigpending: | |||
684 | slgr %r3,%r3 # clear *oldset | 684 | slgr %r3,%r3 # clear *oldset |
685 | brasl %r14,do_signal # call do_signal | 685 | brasl %r14,do_signal # call do_signal |
686 | stnsm __SF_EMPTY(%r15),0xfc # disable I/O and ext. interrupts | 686 | stnsm __SF_EMPTY(%r15),0xfc # disable I/O and ext. interrupts |
687 | j sysc_leave # out of here, do NOT recheck | 687 | j io_work_loop |
688 | 688 | ||
689 | /* | 689 | /* |
690 | * External interrupt handler routine | 690 | * External interrupt handler routine |