diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | i386/i386/locore.S | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-08-04 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * i386/i386/locore.S (TIME_TRAP_UENTRY, TIME_TRAP_SENTRY) + (TIME_TRAP_UEXIT): Use TH_SYSTEM_TIMER instead of old TH_SYS_TIMER. + 2007-07-08 Samuel Thibault <samuel.thibault@ens-lyon.org> * i386/i386/seg.h (SZ_64): New macro. 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 */ |