← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to ports/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ports/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h
97
97
            int si_band;        /* Band event for SIGPOLL.  */
98
98
            int si_fd;
99
99
          } _sigpoll;
 
100
 
 
101
        /* SIGSYS.  */
 
102
        struct
 
103
          {
 
104
            void *_call_addr;   /* Calling user insn.  */
 
105
            int _syscall;       /* Triggering system call number.  */
 
106
            unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
 
107
          } _sigsys;
100
108
      } _sifields;
101
109
  } siginfo_t;
102
110
 
115
123
# define si_addr        _sifields._sigfault.si_addr
116
124
# define si_band        _sifields._sigpoll.si_band
117
125
# define si_fd          _sifields._sigpoll.si_fd
 
126
# define si_call_addr   _sifields._sigsys._call_addr
 
127
# define si_syscall     _sifields._sigsys._syscall
 
128
# define si_arch        _sifields._sigsys._arch
118
129
 
119
130
 
120
131
/* Values for `si_code'.  Positive values are reserved for kernel-generated