diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-07-02 17:19:04 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-12 18:11:43 +0200 |
commit | 6ac5310e649df5fcd240d764503bf16a1317ea39 (patch) | |
tree | 286700815b3f30dc13cc3b2d9980b0244b244d33 /arch/mips/include/uapi/asm/fcntl.h | |
parent | 704e6460ab75af0735b1ca7c0dcaa4ff0a4001b2 (diff) | |
parent | 3f90b82df110ef9cb33761b56ca85ae0d0372d4a (diff) | |
download | op-kernel-dev-6ac5310e649df5fcd240d764503bf16a1317ea39.zip op-kernel-dev-6ac5310e649df5fcd240d764503bf16a1317ea39.tar.gz |
Merge branch '3.10-fixes' into mips-for-linux-next
This that should have been fixed but weren't, way to much, intrusive
and late.
Diffstat (limited to 'arch/mips/include/uapi/asm/fcntl.h')
-rw-r--r-- | arch/mips/include/uapi/asm/fcntl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h index 314c79b..6ca432f 100644 --- a/arch/mips/include/uapi/asm/fcntl.h +++ b/arch/mips/include/uapi/asm/fcntl.h @@ -8,6 +8,7 @@ #ifndef _UAPI_ASM_FCNTL_H #define _UAPI_ASM_FCNTL_H +#include <asm/sgidefs.h> #define O_APPEND 0x0008 #define O_DSYNC 0x0010 /* used to be O_SYNC, see below */ @@ -55,7 +56,8 @@ * contain all the same fields as struct flock. */ -#ifdef CONFIG_32BIT +#if _MIPS_SIM != _MIPS_SIM_ABI64 + #include <linux/types.h> struct flock { @@ -70,7 +72,7 @@ struct flock { #define HAVE_ARCH_STRUCT_FLOCK -#endif /* CONFIG_32BIT */ +#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ #include <asm-generic/fcntl.h> |