From 53571e3955db5a22d06d402e11a65a21c6d8c866 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 4 Aug 2007 10:23:49 +0000 Subject: 2007-08-04 Samuel Thibault * i386/i386/locore.S (TIME_TRAP_UENTRY, TIME_TRAP_SENTRY) (TIME_TRAP_UEXIT): Use TH_SYSTEM_TIMER instead of old TH_SYS_TIMER. --- i386/i386/locore.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'i386') diff --git a/i386/i386/locore.S b/i386/i386/locore.S index 422dc1a..b8e9067 100644 --- a/i386/i386/locore.S +++ b/i386/i386/locore.S @@ -127,7 +127,7 @@ LEXT(retry_table_end) ;\ addl %ebx,LOW_BITS(%ecx) /* add to low bits */ ;\ jns 0f /* if overflow, */ ;\ call timer_normalize /* normalize timer */ ;\ -0: addl $(TH_SYS_TIMER-TH_USER_TIMER),%ecx ;\ +0: addl $(TH_SYSTEM_TIMER-TH_USER_TIMER),%ecx ;\ /* switch to sys timer */;\ movl %ecx,CX(_current_timer,%edx) /* make it current */ ;\ sti /* allow interrupts */ @@ -151,7 +151,7 @@ LEXT(retry_table_end) ;\ pushl %eax /* save %eax */ ;\ call timer_normalize /* normalize timer */ ;\ popl %eax /* restore %eax */ ;\ -0: addl $(TH_SYS_TIMER-TH_USER_TIMER),%ecx ;\ +0: addl $(TH_SYSTEM_TIMER-TH_USER_TIMER),%ecx ;\ /* switch to sys timer */;\ movl %ecx,CX(_current_timer,%edx) /* make it current */ ;\ sti /* allow interrupts */ @@ -172,7 +172,7 @@ LEXT(retry_table_end) ;\ addl %ebx,LOW_BITS(%ecx) /* add to low bits */ ;\ jns 0f /* if overflow, */ ;\ call timer_normalize /* normalize timer */ ;\ -0: addl $(TH_USER_TIMER-TH_SYS_TIMER),%ecx ;\ +0: addl $(TH_USER_TIMER-TH_SYSTEM_TIMER),%ecx ;\ /* switch to user timer */;\ movl %ecx,CX(_current_timer,%edx) /* make it current */ -- cgit v1.2.3