s390/entry: remove mcck clock

In the past machine checks where accounted as irq time. With the conversion
to generic entry, it was decided to account machine checks to the current
context. The stckf at the beginning of the machine check handler and the
lowcore member is no longer required, therefore remove it.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 8aa1f6530a3e42c71e8d5fc03fb1d8e83e75fa2b..69ccc464a4301af29387fce4e585330a95513459 100644 (file)
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -118,8 +118,8 @@ struct lowcore {
        __u64   avg_steal_timer;                /* 0x0300 */
        __u64   last_update_timer;              /* 0x0308 */
        __u64   last_update_clock;              /* 0x0310 */
-       __u64   int_clock;                      /* 0x0318*/
-       __u64   mcck_clock;                     /* 0x0320 */
+       __u64   int_clock;                      /* 0x0318 */
+       __u8    pad_0x0320[0x0328-0x0320];      /* 0x0320 */
        __u64   clock_comparator;               /* 0x0328 */
        __u64   boot_clock[2];                  /* 0x0330 */
 

diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 3f8e760298c2201c3bf207433d2e25ecdcca2dd8..81cf7208804137b2b81b2a3fc8e82884c00fd683 100644 (file)
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -122,7 +122,6 @@ int main(void)
        OFFSET(__LC_LAST_UPDATE_TIMER, lowcore, last_update_timer);
        OFFSET(__LC_LAST_UPDATE_CLOCK, lowcore, last_update_clock);
        OFFSET(__LC_INT_CLOCK, lowcore, int_clock);
-       OFFSET(__LC_MCCK_CLOCK, lowcore, mcck_clock);
        OFFSET(__LC_BOOT_CLOCK, lowcore, boot_clock);
        OFFSET(__LC_CURRENT, lowcore, current_task);
        OFFSET(__LC_KERNEL_STACK, lowcore, kernel_stack);

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 03515302da18e5d7c69d4c142f0c47548906ae46..a660f4b6d6542a8ab1d005894efedcf4c68a84b1 100644 (file)
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -488,7 +488,6 @@ SYM_FUNC_END(psw_idle)
  * Machine check handler routines
  */
 SYM_CODE_START(mcck_int_handler)
-       stckf   __LC_MCCK_CLOCK
        BPOFF
        la      %r1,4095                # validate r1
        spt     __LC_CPU_TIMER_SAVE_AREA-4095(%r1)      # validate cpu timer