diff options
| author | Edjunior Machado <emachado@linux.vnet.ibm.com> | 2013-05-15 20:15:19 +0200 |
|---|---|---|
| committer | Ryan S. Arnold <rsa@linux.vnet.ibm.com> | 2013-07-26 08:58:39 -0500 |
| commit | 979bcc3f2854d938c6e3facf8d0308f4721029a0 (patch) | |
| tree | 007897020522690c5b65c3ed7867be21925955f0 | |
| parent | ed81f668f7c9eff0692c3c81691a7380b55063ff (diff) | |
| download | glibc-979bcc3f2854d938c6e3facf8d0308f4721029a0.tar.gz glibc-979bcc3f2854d938c6e3facf8d0308f4721029a0.tar.xz glibc-979bcc3f2854d938c6e3facf8d0308f4721029a0.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. (cherry picked from commit 12fba011bde4332687819ada867992192e5105f7)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/siginfo.h | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 153515d96f..2c1867c172 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-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 159bafb73a..345d610b80 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. */ |