diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-06 15:18:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:38 -0700 |
| commit | 8d286aa5eaf951bf53d4a0f64576d4b377c435ba (patch) | |
| tree | c2304e6fc3af25b6a09f974fa09db753f6bd8cea /include/asm-mips | |
| parent | 5ac353f9baf7169298ebb7de86b2d697b25bca44 (diff) | |
| download | linux-3.10-8d286aa5eaf951bf53d4a0f64576d4b377c435ba.tar.gz linux-3.10-8d286aa5eaf951bf53d4a0f64576d4b377c435ba.tar.bz2 linux-3.10-8d286aa5eaf951bf53d4a0f64576d4b377c435ba.zip | |
[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 fb824bf0929..06c5d13faf6 100644 --- a/include/asm-mips/fcntl.h +++ b/include/asm-mips/fcntl.h @@ -52,15 +52,6 @@ struct flock { 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 @@ -68,5 +59,8 @@ typedef struct flock64 { #include <asm-generic/fcntl.h> typedef struct flock flock_t; +#ifndef __mips64 +typedef struct flock64 flock64_t; +#endif #endif /* _ASM_FCNTL_H */ |