Commit efccd4e0 authored by Sven Schnelle's avatar Sven Schnelle Committed by Alexander Gordeev
Browse files

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: default avatarSven Schnelle <svens@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent cada938a

arch/s390/include/asm/lowcore.h

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct lowcore { 
	__u64	last_update_timer;		/* 0x0308 */

	__u64	last_update_clock;		/* 0x0310 */

	__u64	int_clock;			/* 0x0318 */

	__u64	mcck_clock;			/* 0x0320 */

	__u8	pad_0x0320[0x0328-0x0320];	/* 0x0320 */

	__u64	clock_comparator;		/* 0x0328 */

	__u64	boot_clock[2];			/* 0x0330 */

arch/s390/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/s390/kernel/entry.S

+0 −1
Original line number Diff line number Diff line
@@ -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