diff -crB linux-2.6.31.14/arch/mips/include/asm/fcntl.h linux-2.6.31.14-copy/arch/mips/include/asm/fcntl.h *** linux-2.6.31.14/arch/mips/include/asm/fcntl.h 2010-07-05 19:11:43.000000000 +0200 --- linux-2.6.31.14-copy/arch/mips/include/asm/fcntl.h 2010-10-26 06:29:01.000000000 +0200 *************** *** 9,36 **** #define _ASM_FCNTL_H ! #define O_APPEND 0x0008 ! #define O_SYNC 0x0010 ! #define O_NONBLOCK 0x0080 ! #define O_CREAT 0x0100 /* not fcntl */ ! #define O_TRUNC 0x0200 /* not fcntl */ ! #define O_EXCL 0x0400 /* not fcntl */ ! #define O_NOCTTY 0x0800 /* not fcntl */ ! #define FASYNC 0x1000 /* fcntl, for BSD compatibility */ ! #define O_LARGEFILE 0x2000 /* allow large file opens */ ! #define O_DIRECT 0x8000 /* direct disk access hint */ ! ! #define F_GETLK 14 ! #define F_SETLK 6 ! #define F_SETLKW 7 ! #define F_SETOWN 24 /* for sockets. */ ! #define F_GETOWN 23 /* for sockets. */ #ifndef __mips64 ! #define F_GETLK64 33 /* using 'struct flock64' */ ! #define F_SETLK64 34 ! #define F_SETLKW64 35 #endif /* --- 9,36 ---- #define _ASM_FCNTL_H ! #define O_APPEND 02000 ! #define O_SYNC 04010000 ! #define O_NONBLOCK 04000 ! #define O_CREAT 0100 /* not fcntl */ ! #define O_TRUNC 01000 /* not fcntl */ ! #define O_EXCL 0200 /* not fcntl */ ! #define O_NOCTTY 0400 /* not fcntl */ ! #define FASYNC 020000 /* fcntl, for BSD compatibility */ ! #define O_LARGEFILE 0100000 /* allow large file opens */ ! #define O_DIRECT 040000 /* direct disk access hint */ ! ! #define F_GETLK 12 ! #define F_SETLK 13 ! #define F_SETLKW 14 ! #define F_SETOWN 8 /* for sockets. */ ! #define F_GETOWN 9 /* for sockets. */ #ifndef __mips64 ! #define F_GETLK64 12 /* using 'struct flock64' */ ! #define F_SETLK64 13 ! #define F_SETLKW64 14 #endif /* Only in linux-2.6.31.14-copy/arch/mips/include/asm: fcntl.h~