[MIPS] Fix sparsemem support.

[linux-2.6-omap-h63xx.git] / include / asm-mips / fcntl.h

diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
index fb824bf0929660e5791260e7ced2912275e931da..43d047a9a6af06aa986b90a93eba696bb22051ac 100644 (file)
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
@@ -3,11 +3,13 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995, 96, 97, 98, 99, 2003 Ralf Baechle
+ * Copyright (C) 1995, 96, 97, 98, 99, 2003, 05 Ralf Baechle
  */
 #ifndef _ASM_FCNTL_H
 #define _ASM_FCNTL_H
 
+#include <linux/config.h>
+
 #define O_APPEND       0x0008
 #define O_SYNC         0x0010
 #define O_NONBLOCK     0x0080
@@ -40,33 +42,22 @@
  * contain all the same fields as struct flock.
  */
 
-#ifndef __mips64
+#ifdef CONFIG_32BIT
 
 struct flock {
        short   l_type;
        short   l_whence;
-       __kernel_off_t l_start;
-       __kernel_off_t l_len;
+       off_t   l_start;
+       off_t   l_len;
        long    l_sysid;
        __kernel_pid_t l_pid;
        long    pad[4];
 };
 
-typedef struct flock64 {
-       short   l_type;
-       short   l_whence;
-       loff_t  l_start;
-       loff_t  l_len;
-       pid_t   l_pid;
-} flock64_t;
-
-
 #define HAVE_ARCH_STRUCT_FLOCK
 
-#endif
+#endif /* CONFIG_32BIT */
 
 #include <asm-generic/fcntl.h>
 
-typedef struct flock flock_t;
-
 #endif /* _ASM_FCNTL_H */