Manual merge with Linus

1 files changed, 1 insertions, 34 deletions

diff --git a/include/asm-alpha/fcntl.h b/include/asm-alpha/fcntl.h
index 6b7d6c1649ce..87f2cf459e26 100644
--- a/include/asm-alpha/fcntl.h
+++ b/include/asm-alpha/fcntl.h
@@ -3,10 +3,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          01000  /* not fcntl */
 #define O_TRUNC          02000  /* not fcntl */
 #define O_EXCL           04000  /* not fcntl */
@@ -14,20 +10,13 @@
 
 #define O_NONBLOCK       00004
 #define O_APPEND         00010
-#define O_NDELAY        O_NONBLOCK
 #define O_SYNC          040000
-#define FASYNC          020000  /* fcntl, for BSD compatibility */
 #define O_DIRECTORY     0100000 /* must be a directory */
 #define O_NOFOLLOW      0200000 /* don't follow links */
 #define O_LARGEFILE     0400000 /* will be set by the kernel on every open */
 #define O_DIRECT        02000000 /* direct disk access - should check with OSF/1 */
 #define O_NOATIME       04000000
 
-#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         7
 #define F_SETLK         8
 #define F_SETLKW        9
@@ -37,9 +26,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         1
 #define F_WRLCK         2
@@ -51,25 +37,6 @@
 
 #define F_INPROGRESS    64
 
-/* 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;
-        __kernel_off_t l_start;
-        __kernel_off_t l_len;
-        __kernel_pid_t l_pid;
-};
-
-#define F_LINUX_SPECIFIC_BASE  1024
+#include <asm-generic/fcntl.h>
 
 #endif