Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ffa7405 authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

[PATCH] s390: cpu timer reset in machine check handler 



Fix wrong move direction of timer values for cpu accounting in case of a
machine check that indicates a broken cpu timer.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f878e436

arch/s390/kernel/entry.S

+3 −3
Original line number Diff line number Diff line
@@ -690,9 +690,9 @@ mcck_int_handler: 
	bo	BASED(0f)

	spt	__LC_LAST_UPDATE_TIMER	# revalidate cpu timer

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_EXIT_TIMER

	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER

	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER

	mvc	__LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER

0:	tm	__LC_MCCK_CODE+2,0x08   # mwp of old psw valid?

	bno	BASED(mcck_no_vtime)	# no -> skip cleanup critical

	tm	__LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?

arch/s390/kernel/entry64.S

+3 −3
Original line number Diff line number Diff line
@@ -727,9 +727,9 @@ mcck_int_handler: 
	jo	0f

	spt	__LC_LAST_UPDATE_TIMER

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_EXIT_TIMER

	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER

	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER

	mvc	__LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER

0:	tm	__LC_MCCK_CODE+2,0x08	# mwp of old psw valid?

	jno	mcck_no_vtime		# no -> no timer update

	tm      __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?