git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: mark read_crX() asm code as volatile
[safe/jmp/linux-2.6]
/
include
/
asm-mips
/
fcntl.h
diff --git
a/include/asm-mips/fcntl.h
b/include/asm-mips/fcntl.h
index
fb824bf
..
2a52333
100644
(file)
--- a/
include/asm-mips/fcntl.h
+++ b/
include/asm-mips/fcntl.h
@@
-3,15
+3,17
@@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1995, 96, 97, 98, 99, 2003 Ralf Baechle
+ * Copyright (C) 1995, 96, 97, 98, 99, 2003
, 05
Ralf Baechle
*/
#ifndef _ASM_FCNTL_H
#define _ASM_FCNTL_H
*/
#ifndef _ASM_FCNTL_H
#define _ASM_FCNTL_H
+
#define O_APPEND 0x0008
#define O_SYNC 0x0010
#define O_NONBLOCK 0x0080
#define O_CREAT 0x0100 /* not fcntl */
#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_EXCL 0x0400 /* not fcntl */
#define O_NOCTTY 0x0800 /* not fcntl */
#define FASYNC 0x1000 /* fcntl, for BSD compatibility */
@@
-24,8
+26,6
@@
#define F_SETOWN 24 /* for sockets. */
#define F_GETOWN 23 /* for sockets. */
#define F_SETOWN 24 /* for sockets. */
#define F_GETOWN 23 /* for sockets. */
-#define F_SETSIG 10 /* for sockets. */
-#define F_GETSIG 11 /* for sockets. */
#ifndef __mips64
#define F_GETLK64 33 /* using 'struct flock64' */
#ifndef __mips64
#define F_GETLK64 33 /* using 'struct flock64' */
@@
-40,33
+40,22
@@
* contain all the same fields as struct flock.
*/
* contain all the same fields as struct flock.
*/
-#if
ndef __mips64
+#if
def CONFIG_32BIT
struct flock {
short l_type;
short l_whence;
struct flock {
short l_type;
short l_whence;
-
__kernel_off_t
l_start;
-
__kernel_off_t
l_len;
+
off_t
l_start;
+
off_t
l_len;
long l_sysid;
__kernel_pid_t l_pid;
long pad[4];
};
long l_sysid;
__kernel_pid_t l_pid;
long pad[4];
};
-typedef struct flock64 {
- short l_type;
- short l_whence;
- loff_t l_start;
- loff_t l_len;
- pid_t l_pid;
-} flock64_t;
-
-
#define HAVE_ARCH_STRUCT_FLOCK
#define HAVE_ARCH_STRUCT_FLOCK
-#endif
+#endif
/* CONFIG_32BIT */
#include <asm-generic/fcntl.h>
#include <asm-generic/fcntl.h>
-typedef struct flock flock_t;
-
#endif /* _ASM_FCNTL_H */
#endif /* _ASM_FCNTL_H */