diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-04 00:22:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-04 00:22:32 +0000 |
| commit | 4ad1d0cfbf96c3dbcf0ba104eb9f81bae6bdc6da (patch) | |
| tree | e9cd4db68a06582802d945faf432460e54ceea82 /linuxthreads/sysdeps/pthread | |
| parent | 68eefde7b626b57d5fde40980084feda77c89801 (diff) | |
| download | glibc-4ad1d0cfbf96c3dbcf0ba104eb9f81bae6bdc6da.tar glibc-4ad1d0cfbf96c3dbcf0ba104eb9f81bae6bdc6da.tar.gz glibc-4ad1d0cfbf96c3dbcf0ba104eb9f81bae6bdc6da.tar.bz2 glibc-4ad1d0cfbf96c3dbcf0ba104eb9f81bae6bdc6da.zip | |
(charmap_read): Prepend the condition filename == NULL.
Diffstat (limited to 'linuxthreads/sysdeps/pthread')
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/pthreadtypes.h | 5 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/pthread.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h b/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h index a53889f5f0..2bb661fea3 100644 --- a/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h +++ b/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h @@ -25,8 +25,9 @@ /* Fast locks (not abstract because mutexes and conditions aren't abstract). */ struct _pthread_fastlock { - long int __status; /* "Free" or "taken" or head of waiting list */ - int __spinlock; /* For compare-and-swap emulation */ + long int __status; /* "Free" or "taken" or head of waiting list */ + int __spinlock; /* Used by compare_and_swap emulation. Also, + adaptive SMP lock stores spin count here. */ }; #ifndef _PTHREAD_DESCR_DEFINED diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index 0e1cbe891f..f9e1fd9787 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -77,10 +77,10 @@ enum enum { - PTHREAD_MUTEX_FAST_NP, + PTHREAD_MUTEX_TIMED_NP, PTHREAD_MUTEX_RECURSIVE_NP, PTHREAD_MUTEX_ERRORCHECK_NP, - PTHREAD_MUTEX_TIMED_NP + PTHREAD_MUTEX_ADAPTIVE_NP #ifdef __USE_UNIX98 , PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP, |