aboutsummaryrefslogtreecommitdiff
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-06 15:17:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:37 -0700
commit9317259ead88fe6c05120ae1e3ace99738e2c698 (patch)
treeb899748ca57a96d59003945f97ceae01b5fdc48c /include/asm-ia64
parent5ba4d46dc44c5399bc4e7a39239de5a1690848a4 (diff)
[PATCH] Create asm-generic/fcntl.h
This set of patches creates asm-generic/fcntl.h and consolidates as much as possible from the asm-*/fcntl.h files into it. This patch just gathers all the identical bits of the asm-*/fcntl.h files into asm-generic/fcntl.h. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/fcntl.h28
1 files changed, 2 insertions, 26 deletions
diff --git a/include/asm-ia64/fcntl.h b/include/asm-ia64/fcntl.h
index cee16ea1780..9f0ec1e4bd5 100644
--- a/include/asm-ia64/fcntl.h
+++ b/include/asm-ia64/fcntl.h
@@ -11,10 +11,6 @@
* open/fcntl - O_SYNC is only implemented on blocks devices and on
* files located on an ext2 file system
*/
-#define O_ACCMODE 0003
-#define O_RDONLY 00
-#define O_WRONLY 01
-#define O_RDWR 02
#define O_CREAT 0100 /* not fcntl */
#define O_EXCL 0200 /* not fcntl */
#define O_NOCTTY 0400 /* not fcntl */
@@ -30,11 +26,6 @@
#define O_NOFOLLOW 0400000 /* don't follow links */
#define O_NOATIME 01000000
-#define F_DUPFD 0 /* dup */
-#define F_GETFD 1 /* get close_on_exec */
-#define F_SETFD 2 /* set/clear close_on_exec */
-#define F_GETFL 3 /* get file->f_flags */
-#define F_SETFL 4 /* set file->f_flags */
#define F_GETLK 5
#define F_SETLK 6
#define F_SETLKW 7
@@ -44,9 +35,6 @@
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */
-/* for F_[GET|SET]FL */
-#define FD_CLOEXEC 1 /* actually anything with low bit set goes */
-
/* for posix fcntl() and lockf() */
#define F_RDLCK 0
#define F_WRLCK 1
@@ -59,18 +47,6 @@
/* for leases */
#define F_INPROGRESS 16
-/* operations for bsd flock(), also used by the kernel implementation */
-#define LOCK_SH 1 /* shared lock */
-#define LOCK_EX 2 /* exclusive lock */
-#define LOCK_NB 4 /* or'd with one of the above to prevent
- blocking */
-#define LOCK_UN 8 /* remove lock */
-
-#define LOCK_MAND 32 /* This is a mandatory flock */
-#define LOCK_READ 64 /* ... Which allows concurrent read operations */
-#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */
-#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */
-
struct flock {
short l_type;
short l_whence;
@@ -79,9 +55,9 @@ struct flock {
pid_t l_pid;
};
-#define F_LINUX_SPECIFIC_BASE 1024
-
#define force_o_largefile() \
(personality(current->personality) != PER_LINUX32)
+#include <asm-generic/fcntl.h>
+
#endif /* _ASM_IA64_FCNTL_H */