diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
| commit | 9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (patch) | |
| tree | bca8230897630ca6721bdd7b959142984afa256a /arch/s390/include/uapi/asm/ucontext.h | |
| parent | 644a918d20336a7deaa81f675c3c2f25bf3dafbb (diff) | |
| parent | d7933ab727ed035bdf420d7381b831ba959cecc5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/s390/include/uapi/asm/ucontext.h')
| -rw-r--r-- | arch/s390/include/uapi/asm/ucontext.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/s390/include/uapi/asm/ucontext.h b/arch/s390/include/uapi/asm/ucontext.h index 200e06325c6a..3e077b2a4705 100644 --- a/arch/s390/include/uapi/asm/ucontext.h +++ b/arch/s390/include/uapi/asm/ucontext.h @@ -16,7 +16,9 @@ struct ucontext_extended { struct ucontext *uc_link; stack_t uc_stack; _sigregs uc_mcontext; - unsigned long uc_sigmask[2]; + sigset_t uc_sigmask; + /* Allow for uc_sigmask growth. Glibc uses a 1024-bit sigset_t. */ + unsigned char __unused[128 - sizeof(sigset_t)]; unsigned long uc_gprs_high[16]; }; @@ -27,7 +29,9 @@ struct ucontext { struct ucontext *uc_link; stack_t uc_stack; _sigregs uc_mcontext; - sigset_t uc_sigmask; /* mask last for extensibility */ + sigset_t uc_sigmask; + /* Allow for uc_sigmask growth. Glibc uses a 1024-bit sigset_t. */ + unsigned char __unused[128 - sizeof(sigset_t)]; }; #endif /* !_ASM_S390_UCONTEXT_H */ |