diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-23 14:59:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-23 14:59:29 -0800 |
| commit | 2bd06ce77ce2ce4fd4a4b10cb03b977ee682b3dc (patch) | |
| tree | 83f76f4f19f4a94c1f97ea15a6a6480332326aef | |
| parent | 13f514bef13ccc574839c624ca7106a92cbd5e3c (diff) | |
| parent | 6ae1756faddefd7494353380ee546dd38c2f97eb (diff) | |
Merge tag 'mips_fixes_4.16_3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
Pull MIPS fix from James Hogan:
"A single MIPS fix for mismatching struct compat_flock, resulting in
bus errors starting Firefox on Debian 8 since 4.13"
* tag 'mips_fixes_4.16_3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
MIPS: Drop spurious __unused in struct compat_flock
| -rw-r--r-- | arch/mips/include/asm/compat.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h index 946681db8dc3..9a0fa66b81ac 100644 --- a/arch/mips/include/asm/compat.h +++ b/arch/mips/include/asm/compat.h @@ -86,7 +86,6 @@ struct compat_flock { compat_off_t l_len; s32 l_sysid; compat_pid_t l_pid; - short __unused; s32 pad[4]; }; |