From b4940b43f37266509081424f620aa42ff5702895 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 27 Jul 2007 12:29:18 +0200 Subject: [PATCH] --- yaml --- r: 63102 b: refs/heads/master c: b771aeac32a320ac52bc227252103d7d7fc48cad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/entry.S | 6 ++++-- trunk/arch/s390/kernel/entry64.S | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9082f0f474c2..d45b45d375a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b3d8c9e06392d5539aa5d652f3a3c385fd19333 +refs/heads/master: b771aeac32a320ac52bc227252103d7d7fc48cad diff --git a/trunk/arch/s390/kernel/entry.S b/trunk/arch/s390/kernel/entry.S index bc7ff3658c3d..f3bceb165321 100644 --- a/trunk/arch/s390/kernel/entry.S +++ b/trunk/arch/s390/kernel/entry.S @@ -624,9 +624,11 @@ io_work_loop: # _TIF_MCCK_PENDING is set, call handler # io_mcck_pending: + TRACE_IRQS_OFF l %r1,BASED(.Ls390_handle_mcck) - la %r14,BASED(io_work_loop) - br %r1 # TIF bit will be cleared by handler + basr %r14,%r1 # TIF bit will be cleared by handler + TRACE_IRQS_ON + b BASED(io_work_loop) # # _TIF_NEED_RESCHED is set, call schedule diff --git a/trunk/arch/s390/kernel/entry64.S b/trunk/arch/s390/kernel/entry64.S index 2a7b1304418b..9c0d5cc8269d 100644 --- a/trunk/arch/s390/kernel/entry64.S +++ b/trunk/arch/s390/kernel/entry64.S @@ -611,8 +611,10 @@ io_work_loop: # _TIF_MCCK_PENDING is set, call handler # io_mcck_pending: - larl %r14,io_work_loop - jg s390_handle_mcck # TIF bit will be cleared by handler + TRACE_IRQS_OFF + brasl %r14,s390_handle_mcck # TIF bit will be cleared by handler + TRACE_IRQS_ON + j io_work_loop # # _TIF_NEED_RESCHED is set, call schedule