Skip to content

Commit efccd4e

Browse files
svens-s390Alexander Gordeev
authored andcommitted
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>
1 parent cada938 commit efccd4e

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

arch/s390/include/asm/lowcore.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ struct lowcore {
118118
__u64 avg_steal_timer; /* 0x0300 */
119119
__u64 last_update_timer; /* 0x0308 */
120120
__u64 last_update_clock; /* 0x0310 */
121-
__u64 int_clock; /* 0x0318*/
122-
__u64 mcck_clock; /* 0x0320 */
121+
__u64 int_clock; /* 0x0318 */
122+
__u8 pad_0x0320[0x0328-0x0320]; /* 0x0320 */
123123
__u64 clock_comparator; /* 0x0328 */
124124
__u64 boot_clock[2]; /* 0x0330 */
125125

arch/s390/kernel/asm-offsets.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ int main(void)
122122
OFFSET(__LC_LAST_UPDATE_TIMER, lowcore, last_update_timer);
123123
OFFSET(__LC_LAST_UPDATE_CLOCK, lowcore, last_update_clock);
124124
OFFSET(__LC_INT_CLOCK, lowcore, int_clock);
125-
OFFSET(__LC_MCCK_CLOCK, lowcore, mcck_clock);
126125
OFFSET(__LC_BOOT_CLOCK, lowcore, boot_clock);
127126
OFFSET(__LC_CURRENT, lowcore, current_task);
128127
OFFSET(__LC_KERNEL_STACK, lowcore, kernel_stack);

arch/s390/kernel/entry.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,6 @@ SYM_FUNC_END(psw_idle)
488488
* Machine check handler routines
489489
*/
490490
SYM_CODE_START(mcck_int_handler)
491-
stckf __LC_MCCK_CLOCK
492491
BPOFF
493492
la %r1,4095 # validate r1
494493
spt __LC_CPU_TIMER_SAVE_AREA-4095(%r1) # validate cpu timer

0 commit comments

Comments
 (0)