diff options
| -rw-r--r-- | linuxthreads/ChangeLog | 3 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/posix-timer.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 168d1f2583..d8bc2cfd90 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,8 @@ 2000-06-08 Ulrich Drepper <drepper@redhat.com> + * sysdeps/pthread/posix-timer.h (timer_ptr2id): Operands in + subtraction were switched. + * sysdeps/pthread/timer_routines.c (init_module): Use THREAD_MAXNODES threads. diff --git a/linuxthreads/sysdeps/pthread/posix-timer.h b/linuxthreads/sysdeps/pthread/posix-timer.h index b10ae736d6..fc56ba61aa 100644 --- a/linuxthreads/sysdeps/pthread/posix-timer.h +++ b/linuxthreads/sysdeps/pthread/posix-timer.h @@ -50,7 +50,6 @@ struct thread_node /* Internal representation of a timer. */ struct timer_node { - pid_t creator_pid; struct list_links links; struct sigevent event; clockid_t clock; @@ -61,6 +60,7 @@ struct timer_node unsigned int armed; unsigned int inuse; struct thread_node *thread; + pid_t creator_pid; }; @@ -94,7 +94,7 @@ timer_id2ptr (timer_t timerid) static inline int timer_ptr2id (struct timer_node *timer) { - return __timer_array - timer; + return timer - __timer_array; } |