Commit 2bd06ce7 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 13f514be 6ae1756f
...@@ -86,7 +86,6 @@ struct compat_flock { ...@@ -86,7 +86,6 @@ struct compat_flock {
compat_off_t l_len; compat_off_t l_len;
s32 l_sysid; s32 l_sysid;
compat_pid_t l_pid; compat_pid_t l_pid;
short __unused;
s32 pad[4]; s32 pad[4];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment