aboutsummaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorStephen Rothwell2005-09-06 15:17:58 -0700
committerLinus Torvalds2005-09-07 16:57:37 -0700
commit2b2fa38e5f3f17a5e1ef3fe29a9869d93197ebfd (patch)
tree22fd529a3e7993b0e0815047a19ca27c9f51bf87 /include/asm-ppc
parent9317259ead88fe6c05120ae1e3ace99738e2c698 (diff)
[PATCH] Consolidate asm-ppc*/fcntl.h
These two files are basically identical, so make one just include the other (protecting the 32-bit-only parts with __powerpc64__). Also remove some completely unused defines. 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.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h
index e8c2dc206612..2f1cfb6f2343 100644
--- a/include/asm-ppc/fcntl.h
+++ b/include/asm-ppc/fcntl.h
@@ -27,9 +27,11 @@
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */
+#ifndef __powerpc64__
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
+#endif
/* for posix fcntl() and lockf() */
#define F_RDLCK 0
@@ -43,12 +45,6 @@
/* for leases */
#define F_INPROGRESS 16
-#ifdef __KERNEL__
-#define F_POSIX 1
-#define F_FLOCK 2
-#define F_BROKEN 4 /* broken flock() emulation */
-#endif /* __KERNEL__ */
-
struct flock {
short l_type;
short l_whence;
@@ -57,6 +53,7 @@ struct flock {
pid_t l_pid;
};
+#ifndef __powerpc64__
struct flock64 {
short l_type;
short l_whence;
@@ -64,7 +61,8 @@ struct flock64 {
loff_t l_len;
pid_t l_pid;
};
+#endif
#include <asm-generic/fcntl.h>
-#endif
+#endif /* _PPC_FCNTL_H */