From 2b2fa38e5f3f17a5e1ef3fe29a9869d93197ebfd Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 6 Sep 2005 15:17:58 -0700 Subject: [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-ppc/fcntl.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'include/asm-ppc') diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h index e8c2dc20661..2f1cfb6f234 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 -#endif +#endif /* _PPC_FCNTL_H */ -- cgit v1.2.3