[PATCH] mm/filemap.c: make two functions static

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

diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
index be971d6ac9b5a7176db8bd23630ee7bf8feddfaf..06c5d13faf6629f933c22c7f70cb9ceea14495dd 100644 (file)
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
@@ -50,32 +50,17 @@ struct flock {
        long    l_sysid;
        __kernel_pid_t l_pid;
        long    pad[4];
-} flock_t;
+};
 
-typedef struct flock64 {
-       short   l_type;
-       short   l_whence;
-       loff_t  l_start;
-       loff_t  l_len;
-       pid_t   l_pid;
-} flock64_t;
-
-#else /* 64-bit definitions */
-
-typedef struct flock {
-       short   l_type;
-       short   l_whence;
-       __kernel_off_t l_start;
-       __kernel_off_t l_len;
-       __kernel_pid_t l_pid;
-} flock_t;
-
-#ifdef __KERNEL__
-#define flock64                flock
-#endif
+#define HAVE_ARCH_STRUCT_FLOCK
 
 #endif
 
 #include <asm-generic/fcntl.h>
 
+typedef struct flock flock_t;
+#ifndef __mips64
+typedef struct flock64 flock64_t;
+#endif
+
 #endif /* _ASM_FCNTL_H */