diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-06 15:18:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:38 -0700 |
| commit | 5ac353f9baf7169298ebb7de86b2d697b25bca44 (patch) | |
| tree | 2591e241e07c96d19db85d418ff6623ec394f984 /include/asm-mips | |
| parent | 1abf62afb6e9cdc1b2618b69067a186b94281587 (diff) | |
| download | kernel_samsung_tuna-5ac353f9baf7169298ebb7de86b2d697b25bca44.zip kernel_samsung_tuna-5ac353f9baf7169298ebb7de86b2d697b25bca44.tar.gz kernel_samsung_tuna-5ac353f9baf7169298ebb7de86b2d697b25bca44.tar.bz2 | |
[PATCH] Clean up struct flock definitions
This patch just gathers together all the struct flock definitions except
xtensa into asm-generic/fcntl.h.
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 | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h index be971d6..fb824bf 100644 --- a/include/asm-mips/fcntl.h +++ b/include/asm-mips/fcntl.h @@ -50,7 +50,7 @@ struct flock { long l_sysid; __kernel_pid_t l_pid; long pad[4]; -} flock_t; +}; typedef struct flock64 { short l_type; @@ -60,22 +60,13 @@ typedef struct flock64 { 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; + #endif /* _ASM_FCNTL_H */ |