From: Martin Schwidefsky Date: Thu, 8 Aug 2013 10:37:00 +0000 (+0200) Subject: s390/time: clock comparator revalidation X-Git-Tag: next-20130822~110^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d7e8d898cde867941204d48b805bd1d1776e1e0;p=karo-tx-linux.git s390/time: clock comparator revalidation Always use the S390_lowcore.clock_comparator field to revalidate the clock comparator CPU register after a machine check. This avoids an unnecssary external interrupt after a machine check if no timer is pending. Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c index 504175ebf8b0..c4c033819879 100644 --- a/arch/s390/kernel/nmi.c +++ b/arch/s390/kernel/nmi.c @@ -214,10 +214,7 @@ static int notrace s390_revalidate_registers(struct mci *mci) : "0", "cc"); #endif /* Revalidate clock comparator register */ - if (S390_lowcore.clock_comparator == -1) - set_clock_comparator(S390_lowcore.mcck_clock); - else - set_clock_comparator(S390_lowcore.clock_comparator); + set_clock_comparator(S390_lowcore.clock_comparator); /* Check if old PSW is valid */ if (!mci->wp) /*