Merge tag 'mips_fixes_4.16_3' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

2bd06ce7 · Linus Torvalds <[email protected]> · 2018-02-23 14:59:29 -08:00

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

Commit: 2bd06ce77ce2ce4fd4a4b10cb03b977ee682b3dc
Parents: 13f514be · 6ae1756f

Merge commit. Changes below are compared with the first parent: 13f514be.

Changes

1 files changed · +0 −1

File	Status	Add	Del	Content
arch/mips/include/asm/compat.h	modified	+0	−1	View file

arch/mips/include/asm/compat.h

View file

diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h
index 946681d..9a0fa66 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];
 };
 