diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-09 14:18:10 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-09 14:18:10 +0200 |
| commit | ab08ff34b44f752b664ebb312d2e110cf37a7f5e (patch) | |
| tree | 80579bb79480ac303cad99c359549d4e86bcc773 /arch/s390/include/uapi/asm/siginfo.h | |
| parent | 450e47da67499aeb6f1700e8f84747460c11ab56 (diff) | |
| parent | 9807f75955ea7f1877981056755284481873115c (diff) | |
Merge tag 'disintegrate-s390-20121009' of
git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI patchset from David Howells:
"Can you merge the following branch into the s390 tree please.
This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently."
Conflicts:
arch/s390/include/asm/chpid.h
Diffstat (limited to 'arch/s390/include/uapi/asm/siginfo.h')
| -rw-r--r-- | arch/s390/include/uapi/asm/siginfo.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/s390/include/uapi/asm/siginfo.h b/arch/s390/include/uapi/asm/siginfo.h new file mode 100644 index 00000000000..91fd3e4b70c --- /dev/null +++ b/arch/s390/include/uapi/asm/siginfo.h @@ -0,0 +1,16 @@ +/* + * S390 version + * + * Derived from "include/asm-i386/siginfo.h" + */ + +#ifndef _S390_SIGINFO_H +#define _S390_SIGINFO_H + +#ifdef __s390x__ +#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) +#endif + +#include <asm-generic/siginfo.h> + +#endif |