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.
(cherry picked from commit 12fba011bde4332687819ada867992192e5105f7)

diff --git a/ChangeLog b/ChangeLog
index 153515d96f883d49e3ea5081363a3ae4f2ddfc2c..2c1867c17278d0d0d71592510a3935dc117820ce 100644 (file)
--- 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-17  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        [BZ # 15497]

diff --git a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
index 159bafb73a5129df2341054fae0018755eb19011..345d610b8025b998e7e75b7fa364bf0aa7272db6 100644 (file)
--- 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.         */