← Back to branch summary

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

« back to all changes in this revision

Viewing changes to sysdeps/unix/sysv/linux/s390/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:
sysdeps/unix/sysv/linux/s390/bits/siginfo.h
1
1
/* siginfo_t, sigevent and constants.  S/390 version.
2
 
   Copyright (C) 2001, 2002, 2003, 2009, 2011, 2012 Free Software Foundation, Inc.
 
2
   Copyright (C) 2001-2012 Free Software Foundation, Inc.
3
3
   This file is part of the GNU C Library.
4
4
 
5
5
   The GNU C Library is free software; you can redistribute it and/or
104
104
            long int si_band;   /* Band event for SIGPOLL.  */
105
105
            int si_fd;
106
106
          } _sigpoll;
 
107
 
 
108
        /* SIGSYS.  */
 
109
        struct
 
110
          {
 
111
            void *_call_addr;   /* Calling user insn.  */
 
112
            int _syscall;       /* Triggering system call number.  */
 
113
            unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
 
114
          } _sigsys;
107
115
      } _sifields;
108
116
  } siginfo_t;
109
117
 
123
131
# define si_trapno      _sifields._sigfault.si_trapno
124
132
# define si_band        _sifields._sigpoll.si_band
125
133
# define si_fd          _sifields._sigpoll.si_fd
 
134
# define si_call_addr   _sifields._sigsys._call_addr
 
135
# define si_syscall     _sifields._sigsys._syscall
 
136
# define si_arch        _sifields._sigsys._arch
126
137
 
127
138
 
128
139
/* Values for `si_code'.  Positive values are reserved for kernel-generated