aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ppc
diff options
context:
space:
mode:
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 @@
27#define F_SETSIG 10 /* for sockets. */ 27#define F_SETSIG 10 /* for sockets. */
28#define F_GETSIG 11 /* for sockets. */ 28#define F_GETSIG 11 /* for sockets. */
29 29
30#ifndef __powerpc64__
30#define F_GETLK64 12 /* using 'struct flock64' */ 31#define F_GETLK64 12 /* using 'struct flock64' */
31#define F_SETLK64 13 32#define F_SETLK64 13
32#define F_SETLKW64 14 33#define F_SETLKW64 14
34#endif
33 35
34/* for posix fcntl() and lockf() */ 36/* for posix fcntl() and lockf() */
35#define F_RDLCK 0 37#define F_RDLCK 0
@@ -43,12 +45,6 @@
43/* for leases */ 45/* for leases */
44#define F_INPROGRESS 16 46#define F_INPROGRESS 16
45 47
46#ifdef __KERNEL__
47#define F_POSIX 1
48#define F_FLOCK 2
49#define F_BROKEN 4 /* broken flock() emulation */
50#endif /* __KERNEL__ */
51
52struct flock { 48struct flock {
53 short l_type; 49 short l_type;
54 short l_whence; 50 short l_whence;
@@ -57,6 +53,7 @@ struct flock {
57 pid_t l_pid; 53 pid_t l_pid;
58}; 54};
59 55
56#ifndef __powerpc64__
60struct flock64 { 57struct flock64 {
61 short l_type; 58 short l_type;
62 short l_whence; 59 short l_whence;
@@ -64,7 +61,8 @@ struct flock64 {
64 loff_t l_len; 61 loff_t l_len;
65 pid_t l_pid; 62 pid_t l_pid;
66}; 63};
64#endif
67 65
68#include <asm-generic/fcntl.h> 66#include <asm-generic/fcntl.h>
69 67
70#endif 68#endif /* _PPC_FCNTL_H */