diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-06 18:18:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:38 -0400 |
commit | 8d286aa5eaf951bf53d4a0f64576d4b377c435ba (patch) | |
tree | c2304e6fc3af25b6a09f974fa09db753f6bd8cea /include/asm-mips | |
parent | 5ac353f9baf7169298ebb7de86b2d697b25bca44 (diff) |
[PATCH] Clean up struct flock64 definitions
This patch gathers all the struct flock64 definitions (and the operations),
puts them under !CONFIG_64BIT and cleans up the arch files.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/fcntl.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h index fb824bf09296..06c5d13faf66 100644 --- a/include/asm-mips/fcntl.h +++ b/include/asm-mips/fcntl.h | |||
@@ -52,15 +52,6 @@ struct flock { | |||
52 | long pad[4]; | 52 | long pad[4]; |
53 | }; | 53 | }; |
54 | 54 | ||
55 | typedef struct flock64 { | ||
56 | short l_type; | ||
57 | short l_whence; | ||
58 | loff_t l_start; | ||
59 | loff_t l_len; | ||
60 | pid_t l_pid; | ||
61 | } flock64_t; | ||
62 | |||
63 | |||
64 | #define HAVE_ARCH_STRUCT_FLOCK | 55 | #define HAVE_ARCH_STRUCT_FLOCK |
65 | 56 | ||
66 | #endif | 57 | #endif |
@@ -68,5 +59,8 @@ typedef struct flock64 { | |||
68 | #include <asm-generic/fcntl.h> | 59 | #include <asm-generic/fcntl.h> |
69 | 60 | ||
70 | typedef struct flock flock_t; | 61 | typedef struct flock flock_t; |
62 | #ifndef __mips64 | ||
63 | typedef struct flock64 flock64_t; | ||
64 | #endif | ||
71 | 65 | ||
72 | #endif /* _ASM_FCNTL_H */ | 66 | #endif /* _ASM_FCNTL_H */ |