summaryrefslogtreecommitdiff
path: root/include/asm-sparc64/fcntl.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-07 02:18:00 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 03:57:38 +0400
commit5ac353f9baf7169298ebb7de86b2d697b25bca44 (patch)
tree2591e241e07c96d19db85d418ff6623ec394f984 /include/asm-sparc64/fcntl.h
parent1abf62afb6e9cdc1b2618b69067a186b94281587 (diff)
downloadlinux-5ac353f9baf7169298ebb7de86b2d697b25bca44.tar.xz
[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-sparc64/fcntl.h')
-rw-r--r--include/asm-sparc64/fcntl.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
index 3db10e076eec..b2aecf0054bd 100644
--- a/include/asm-sparc64/fcntl.h
+++ b/include/asm-sparc64/fcntl.h
@@ -29,14 +29,7 @@
#define F_WRLCK 2
#define F_UNLCK 3
-struct flock {
- short l_type;
- short l_whence;
- off_t l_start;
- off_t l_len;
- pid_t l_pid;
- short __unused;
-};
+#define __ARCH_FLOCK_PAD short __unused;
#include <asm-generic/fcntl.h>