diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-11-06 01:04:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-11-06 01:04:13 +0000 |
| commit | 94a749f69ad4b18250e9aab7292b6e8496e0a065 (patch) | |
| tree | 6b5d03838e15c61567cdd90c56e99b2b6dcf1561 | |
| parent | ffb1b882828a6fa71fb4e9be1c30cacafb3c70c3 (diff) | |
* time/tzfile.c (__tzfile_read): Fix check for version 0 data files.
Patch by Szymon Siwek <sls@poczta.wp.pl>.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S | 4 | ||||
| -rw-r--r-- | nscd/nscd.conf | 2 | ||||
| -rw-r--r-- | time/tzfile.c | 2 |
6 files changed, 18 insertions, 8 deletions
@@ -1,5 +1,8 @@ 2007-11-05 Ulrich Drepper <drepper@redhat.com> + * time/tzfile.c (__tzfile_read): Fix check for version 0 data files. + Patch by Szymon Siwek <sls@poczta.wp.pl>. + * nscd/aicache.c (addhstaiX): Check herrno after IPv4 lookup only when the lookup call failed. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 6ea079a1b2..6461785669 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2007-11-03 Mike Frysinger <vapier@gentoo.org> + + * sysdeps/unix/sysv/linux/sh/lowlevellock.S (LOAD_FUTEX_WAIT): Add + missing line continuations. + * sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S (LOAD_FUTEX_WAIT, + LOAD_FUTEX_WAKE): Likewise. Also add missing 3rd parameter. + 2007-10-28 Ulrich Drepper <drepper@redhat.com> [BZ #5220] diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S index e929e28499..769cac3ccd 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S @@ -76,7 +76,7 @@ add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ - mov #FUTEX_PRIVATE_FLAG, tmp + mov #FUTEX_PRIVATE_FLAG, tmp ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 98: extu.b tmp, tmp ; \ xor tmp, reg ; \ @@ -88,7 +88,7 @@ add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ - mov #FUTEX_PRIVATE_FLAG, tmp + mov #FUTEX_PRIVATE_FLAG, tmp ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 98: extu.b tmp, tmp ; \ xor tmp, reg ; \ @@ -96,13 +96,13 @@ mov #FUTEX_WAIT, tmp ; \ or tmp, reg # endif -# define LOAD_FUTEX_WAKE(reg,tmp) \ +# define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, tmp2 ; \ add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ - mov #FUTEX_PRIVATE_FLAG, tmp + mov #FUTEX_PRIVATE_FLAG, tmp ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 98: extu.b tmp, tmp ; \ xor tmp, reg ; \ diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S index 0ebfbfe8c9..13093422a3 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S @@ -42,7 +42,7 @@ add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ - mov #FUTEX_PRIVATE_FLAG, tmp + mov #FUTEX_PRIVATE_FLAG, tmp ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 98: extu.b tmp, tmp ; \ xor tmp, reg ; \ @@ -54,7 +54,7 @@ add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ - mov #FUTEX_PRIVATE_FLAG, tmp + mov #FUTEX_PRIVATE_FLAG, tmp ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ 98: extu.b tmp, tmp ; \ xor tmp, reg ; \ diff --git a/nscd/nscd.conf b/nscd/nscd.conf index 84f335e40f..ada88e6a3d 100644 --- a/nscd/nscd.conf +++ b/nscd/nscd.conf @@ -32,7 +32,7 @@ # logfile /var/log/nscd.log # threads 4 -# max-threads 128 +# max-threads 32 # server-user nobody # stat-user somebody debug-level 0 diff --git a/time/tzfile.c b/time/tzfile.c index d19b7e9b4f..970022379a 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -381,7 +381,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap) else tzspec[tzspec_len - 1] = '\0'; } - else if (sizeof (time_t) == 4 && tzhead.tzh_version != '\0') + else if (sizeof (time_t) == 4 && tzhead.tzh_version[0] != '\0') { /* Get the TZ string. */ if (__builtin_expect (fread_unlocked ((void *) &tzhead, sizeof (tzhead), |