diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-08-08 12:37:00 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-08-22 12:20:08 +0200 |
| commit | b6bed093f489ef0a858e63eebcf5f2fb71ed3222 (patch) | |
| tree | 617b24e54de68ea0f9f3702b736da224ff4db9c2 /arch | |
| parent | 363fd4c1f17b94b2076b57286e9507785a05bbce (diff) | |
| download | linux-b6bed093f489ef0a858e63eebcf5f2fb71ed3222.tar.bz2 | |
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 <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/nmi.c | 5 |
1 files changed, 1 insertions, 4 deletions
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) /* |