mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-11 03:40:06 +00:00
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
This commit is contained in:
commit
a450513e1d
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user