From: Heiko Carstens <heiko.carstens@de.ibm.com> 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> --- arch/s390/kernel/entry.S | 6 +++--- arch/s390/kernel/entry64.S | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff -puN arch/s390/kernel/entry64.S~s390-cpu-timer-reset-in-machine-check-handler arch/s390/kernel/entry64.S --- 25/arch/s390/kernel/entry64.S~s390-cpu-timer-reset-in-machine-check-handler Mon Jul 11 16:37:36 2005 +++ 25-akpm/arch/s390/kernel/entry64.S Mon Jul 11 16:37:36 2005 @@ -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 ? diff -puN arch/s390/kernel/entry.S~s390-cpu-timer-reset-in-machine-check-handler arch/s390/kernel/entry.S --- 25/arch/s390/kernel/entry.S~s390-cpu-timer-reset-in-machine-check-handler Mon Jul 11 16:37:36 2005 +++ 25-akpm/arch/s390/kernel/entry.S Mon Jul 11 16:37:36 2005 @@ -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 ? _