From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 12 Jun 2013 17:05:05 +0000 (+0200)
Subject: MIPS: <uapi/asm/fcntl.h>: Don't reference CONFIG_* symbols.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b8121f0f2fd9668ac4290bd969b664a4c1ca9ad5;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

MIPS: <uapi/asm/fcntl.h>: Don't reference CONFIG_* symbols.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h
index 0bda78f70e1e..6e9e74648f98 100644
--- a/arch/mips/include/uapi/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
@@ -8,6 +8,7 @@
 #ifndef _ASM_FCNTL_H
 #define _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>