diff options
| author |   Will Deacon <will.deacon@arm.com> | 2018-03-20 09:57:15 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-03-20 09:57:15 +0000 |
| commit | 4c0ca49e6d71beab814356dc065f542ad8739f99 (patch) | |
| tree | f9cc035c788970811d811a4412b646b1f3fd4396 /include/linux | |
| parent | arm64: Expose Arm v8.4 features (diff) | |
| parent | signal: Add FPE_FLTUNK si_code for undiagnosable fp exceptions (diff) | |
Merge branch 'siginfo-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace into aarch64/for-next/core
Pull in pending siginfo changes from Eric Biederman as we depend on
the definition of FPE_FLTUNK for cleaning up our floating-point exception
signal delivery (which is currently broken and using FPE_FIXME).
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 8a9643857c4a..e16d07eb08cf 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -229,13 +229,13 @@ typedef struct compat_siginfo { short int _addr_lsb; /* Valid LSB of the reported address. */ /* used when si_code=SEGV_BNDERR */ struct { - short _dummy_bnd; + compat_uptr_t _dummy_bnd; compat_uptr_t _lower; compat_uptr_t _upper; } _addr_bnd; /* used when si_code=SEGV_PKUERR */ struct { - short _dummy_pkey; + compat_uptr_t _dummy_pkey; u32 _pkey; } _addr_pkey; }; |