diff options
| author | Stephen Rothwell | 2005-09-06 15:18:00 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-07 16:57:38 -0700 |
| commit | 5ac353f9baf7169298ebb7de86b2d697b25bca44 (patch) | |
| tree | 2591e241e07c96d19db85d418ff6623ec394f984 /include/asm-s390 | |
| parent | 1abf62afb6e9cdc1b2618b69067a186b94281587 (diff) | |
[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-s390')
| -rw-r--r-- | include/asm-s390/fcntl.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h index 2974433e8ea4..3a66fba09ee9 100644 --- a/include/asm-s390/fcntl.h +++ b/include/asm-s390/fcntl.h @@ -12,17 +12,7 @@ #define F_GETLK64 12 /* using 'struct flock64' */ #define F_SETLK64 13 #define F_SETLKW64 14 -#endif /* ! __s390x__ */ -struct flock { - short l_type; - short l_whence; - off_t l_start; - off_t l_len; - pid_t l_pid; -}; - -#ifndef __s390x__ struct flock64 { short l_type; short l_whence; |