[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: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
f878e43675
commit
8ffa7405af
|
@ -690,9 +690,9 @@ mcck_int_handler:
|
||||||
bo BASED(0f)
|
bo BASED(0f)
|
||||||
spt __LC_LAST_UPDATE_TIMER # revalidate cpu timer
|
spt __LC_LAST_UPDATE_TIMER # revalidate cpu timer
|
||||||
#ifdef CONFIG_VIRT_CPU_ACCOUNTING
|
#ifdef CONFIG_VIRT_CPU_ACCOUNTING
|
||||||
mvc __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
|
mvc __LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
|
||||||
mvc __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
|
mvc __LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
|
||||||
mvc __LC_LAST_UPDATE_TIMER(8),__LC_EXIT_TIMER
|
mvc __LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER
|
||||||
0: tm __LC_MCCK_CODE+2,0x08 # mwp of old psw valid?
|
0: tm __LC_MCCK_CODE+2,0x08 # mwp of old psw valid?
|
||||||
bno BASED(mcck_no_vtime) # no -> skip cleanup critical
|
bno BASED(mcck_no_vtime) # no -> skip cleanup critical
|
||||||
tm __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?
|
tm __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?
|
||||||
|
|
|
@ -727,9 +727,9 @@ mcck_int_handler:
|
||||||
jo 0f
|
jo 0f
|
||||||
spt __LC_LAST_UPDATE_TIMER
|
spt __LC_LAST_UPDATE_TIMER
|
||||||
#ifdef CONFIG_VIRT_CPU_ACCOUNTING
|
#ifdef CONFIG_VIRT_CPU_ACCOUNTING
|
||||||
mvc __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
|
mvc __LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
|
||||||
mvc __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
|
mvc __LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER
|
||||||
mvc __LC_LAST_UPDATE_TIMER(8),__LC_EXIT_TIMER
|
mvc __LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER
|
||||||
0: tm __LC_MCCK_CODE+2,0x08 # mwp of old psw valid?
|
0: tm __LC_MCCK_CODE+2,0x08 # mwp of old psw valid?
|
||||||
jno mcck_no_vtime # no -> no timer update
|
jno mcck_no_vtime # no -> no timer update
|
||||||
tm __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?
|
tm __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?
|
||||||
|
|
Loading…
Reference in New Issue