diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-07 21:52:39 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-07 21:52:39 -0400 |
| commit | a450513e1d51cb8fe46ba5ebd92399247060b980 (patch) | |
| tree | 841c1c71f8a899f67c9d8e14cde9a85ffb9f6c16 | |
| parent | 08a300c956feeca7ccb9081f88701229da8e25c5 (diff) | |
| parent | 59178ef977d3c8392eff263d40a16d7c741edca4 (diff) | |
| download | glibc-a450513e1d51cb8fe46ba5ebd92399247060b980.zip glibc-a450513e1d51cb8fe46ba5ebd92399247060b980.tar.gz glibc-a450513e1d51cb8fe46ba5ebd92399247060b980.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/sem.h | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -3,6 +3,12 @@ * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Simplify AVX check. +2011-09-07 Andreas Schwab <schwab@redhat.com> + + [BZ #13144] + * sysdeps/unix/sysv/linux/x86_64/bits/sem.h (semdid_ds): Revert + last change. + 2011-09-07 Ulrich Drepper <drepper@gmail.com> * sysdeps/unix/sysv/linux/x86_64/init-first.c diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h index 7153e21..e86c357 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h @@ -40,13 +40,9 @@ struct semid_ds { struct ipc_perm sem_perm; /* operation permission struct */ __time_t sem_otime; /* last semop() time */ -#if __WORDSIZE == 32 unsigned long int __unused1; -#endif __time_t sem_ctime; /* last time changed by semctl() */ -#if __WORDSIZE == 32 unsigned long int __unused2; -#endif unsigned long int sem_nsems; /* number of semaphores in set */ unsigned long int __unused3; unsigned long int __unused4; |