s390/time: clock comparator revalidation
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 8 Aug 2013 10:37:00 +0000 (12:37 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 22 Aug 2013 10:20:08 +0000 (12:20 +0200)
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 <schwidefsky@de.ibm.com>
arch/s390/kernel/nmi.c

index 504175ebf8b0fe301fcb974214a8f18b04439d0f..c4c0338198791d4a187c73f8490c0fc39595078d 100644 (file)
@@ -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)
                /*