---

yaml --- r: 11263 b: refs/heads/master c: b4f8c42 h: refs/heads/master i: 11261: 7dacfd2 11259: c693af2 11255: d072a29 11247: 3ed97df 11231: 8f18da4 11199: 81a41b3 11135: 3a89d59 11007: 52697f9 10751: f249ade 10239: 12a7403 v: v3
git-mirror · Oct 29, 2005 · 64a15b2 · 64a15b2
1 parent 89ea817
commit 64a15b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cd9b6802d39c155d44fc8076b6c72c3f7e919ed
+refs/heads/master: b4f8c4230708711c3b12c095cf6a59e6d06a183d
diff --git a/trunk/include/asm-mips/fcntl.h b/trunk/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,27 +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];
 };
 
 #define HAVE_ARCH_STRUCT_FLOCK
 
-#endif
+#endif /* CONFIG_32BIT */
 
 #include <asm-generic/fcntl.h>
 
-typedef struct flock flock_t;
-#ifndef __mips64
-typedef struct flock64 flock64_t;
-#endif
-
 #endif /* _ASM_FCNTL_H */