aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdjunior Machado <emachado@linux.vnet.ibm.com>2013-05-15 20:15:19 +0200
committerAndreas Jaeger <aj@suse.de>2013-05-15 20:15:19 +0200
commit12fba011bde4332687819ada867992192e5105f7 (patch)
treed9ab349e353a7dd531a6980ebf040f240aba3189
parentb861c6c4c95126758339f5684431f77352381f59 (diff)
downloadglibc-12fba011bde4332687819ada867992192e5105f7.tar
glibc-12fba011bde4332687819ada867992192e5105f7.tar.gz
glibc-12fba011bde4332687819ada867992192e5105f7.tar.bz2
glibc-12fba011bde4332687819ada867992192e5105f7.zip
Update s390/bits/siginfo.h
2013-05-15 Edjunior Machado <emachado@linux.vnet.ibm.com> * sysdeps/unix/sysv/linux/s390/bits/siginfo.h (siginfo_t): Remove si_trapno and add si_addr_lsb to _sifields.sigfault. (si_trapno): Remove macro. (si_addr_lsb): Define new macro. (BUS_MCEERR_AR, BUS_MCEERR_AO): Define new values.
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/siginfo.h10
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d14d73e615..79faa94372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-15 Edjunior Machado <emachado@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/bits/siginfo.h (siginfo_t): Remove
+ si_trapno and add si_addr_lsb to _sifields.sigfault.
+ (si_trapno): Remove macro.
+ (si_addr_lsb): Define new macro.
+ (BUS_MCEERR_AR, BUS_MCEERR_AO): Define new values.
+
2013-05-15 Joseph Myers <joseph@codesourcery.com>
* math/libm-test.inc (llrint_test): Consistently use TEST_f_L
diff --git a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
index ad122084c5..19c94e77bc 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
@@ -95,7 +95,7 @@ typedef struct
struct
{
void *si_addr; /* Faulting insn/memory ref. */
- int si_trapno;
+ short si_addr_lsb; /* Valid LSB of the reported address. */
} _sigfault;
/* SIGPOLL. */
@@ -128,7 +128,7 @@ typedef struct
# define si_int _sifields._rt.si_sigval.sival_int
# define si_ptr _sifields._rt.si_sigval.sival_ptr
# define si_addr _sifields._sigfault.si_addr
-# define si_trapno _sifields._sigfault.si_trapno
+# define si_addr_lsb _sifields._sigfault.si_addr_lsb
# define si_band _sifields._sigpoll.si_band
# define si_fd _sifields._sigpoll.si_fd
# define si_call_addr _sifields._sigsys._call_addr
@@ -219,8 +219,12 @@ enum
# define BUS_ADRALN BUS_ADRALN
BUS_ADRERR, /* Non-existant physical address. */
# define BUS_ADRERR BUS_ADRERR
- BUS_OBJERR /* Object specific hardware error. */
+ BUS_OBJERR, /* Object specific hardware error. */
# define BUS_OBJERR BUS_OBJERR
+ BUS_MCEERR_AR, /* Hardware memory error: action required. */
+# define BUS_MCEERR_AR BUS_MCEERR_AR
+ BUS_MCEERR_AO /* Hardware memory error: action optional. */
+# define BUS_MCEERR_AO BUS_MCEERR_AO
};
/* `si_code' values for SIGTRAP signal. */