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-ppc | |
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-ppc')
-rw-r--r-- | include/asm-ppc/fcntl.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h index 4480f21bfdea..7ef37443cc5c 100644 --- a/include/asm-ppc/fcntl.h +++ b/include/asm-ppc/fcntl.h | |||
@@ -6,20 +6,6 @@ | |||
6 | #define O_LARGEFILE 0200000 | 6 | #define O_LARGEFILE 0200000 |
7 | #define O_DIRECT 0400000 /* direct disk access hint */ | 7 | #define O_DIRECT 0400000 /* direct disk access hint */ |
8 | 8 | ||
9 | #ifndef __powerpc64__ | ||
10 | #define F_GETLK64 12 /* using 'struct flock64' */ | ||
11 | #define F_SETLK64 13 | ||
12 | #define F_SETLKW64 14 | ||
13 | |||
14 | struct flock64 { | ||
15 | short l_type; | ||
16 | short l_whence; | ||
17 | loff_t l_start; | ||
18 | loff_t l_len; | ||
19 | pid_t l_pid; | ||
20 | }; | ||
21 | #endif | ||
22 | |||
23 | #include <asm-generic/fcntl.h> | 9 | #include <asm-generic/fcntl.h> |
24 | 10 | ||
25 | #endif /* _PPC_FCNTL_H */ | 11 | #endif /* _PPC_FCNTL_H */ |