summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-06-12 19:05:05 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-06-13 16:43:19 +0200
commitb8121f0f2fd9668ac4290bd969b664a4c1ca9ad5 (patch)
treeb534f132a36dd81bf50996ecca8fcaba9facfc4a
parentb378758658d91656b864170ad896f45269c22e2f (diff)
downloadtalos-obmc-linux-b8121f0f2fd9668ac4290bd969b664a4c1ca9ad5.tar.gz
talos-obmc-linux-b8121f0f2fd9668ac4290bd969b664a4c1ca9ad5.zip
MIPS: <uapi/asm/fcntl.h>: Don't reference CONFIG_* symbols.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/include/uapi/asm/fcntl.h6
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 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>
OpenPOWER on IntegriCloud