summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-10-29 22:43:08 -0700
committerUlrich Drepper <drepper@redhat.com>2009-10-29 22:43:08 -0700
commit204fcca27c0f787daf95ca6f0c787842eb8a50d8 (patch)
treec0b2fbbb8adb686bbddea279bedc1b23553db78b
parentb0e477a9aa6dafd5b9780b2248e61620e2c83d32 (diff)
Fix IA-64 and S390 sigevent definitions.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/siginfo.h6
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/siginfo.h10
3 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 47241cc9ae..3d869910a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-29 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10446]
+ * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Match sigevent
+ definition to the kernel's.
+ * sysdeps/unix/sysv/linux/s390/bits/siginfo.h: Likewise.
+
2009-08-18 Anders Johansson <ajohansson@novell.com>
* nscd/aicache.c: Fix mixing up dataset and dataset->resp
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
index 66310c65b3..240ebbc9e1 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
@@ -1,5 +1,5 @@
/* siginfo_t, sigevent and constants. Linux/ia64 version.
- Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2000-2004, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
@@ -310,6 +310,10 @@ typedef struct sigevent
{
int _pad[__SIGEV_PAD_SIZE];
+ /* When SIGEV_SIGNAL and SIGEV_THREAD_ID set, LWP ID of the
+ thread to receive the signal. */
+ __pid_t _tid;
+
struct
{
void (*_function) (sigval_t); /* Function to start. */
diff --git a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
index 0b79853137..55b3f88c0a 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
@@ -1,5 +1,5 @@
/* siginfo_t, sigevent and constants. S/390 version.
- Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
#if (!defined __have_sigval_t \
&& (defined _SIGNAL_H || defined __need_siginfo_t \
- || defined __need_sigevent_t))
+ || defined __need_sigevent_t))
# define __have_sigval_t 1
/* Type for data associated with a signal. */
@@ -96,7 +96,7 @@ typedef struct siginfo
struct
{
void *si_addr; /* Faulting insn/memory ref. */
- int si_trapno;
+ int si_trapno;
} _sigfault;
/* SIGPOLL. */
@@ -282,6 +282,10 @@ typedef struct sigevent
{
int _pad[__SIGEV_PAD_SIZE];
+ /* When SIGEV_SIGNAL and SIGEV_THREAD_ID set, LWP ID of the
+ thread to receive the signal. */
+ __pid_t _tid;
+
struct
{
void (*_function) (sigval_t); /* Function to start. */