[NETFILTER]: nf_queue: move list_head/skb/id to struct nf_info

[linux-2.6] / include / asm-sparc / fcntl.h

diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 634557374e955615004a3adce28ce73f0c8e49b7..5ec546349fc8757da63255da0d142101858137ef 100644 (file)
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
@@ -16,6 +16,7 @@
 #define O_LARGEFILE    0x40000
 #define O_DIRECT        0x100000 /* direct disk access hint */
 #define O_NOATIME      0x200000
+#define O_CLOEXEC      0x400000
 
 #define F_GETOWN       5       /*  for sockets. */
 #define F_SETOWN       6       /*  for sockets. */
@@ -23,25 +24,13 @@
 #define F_SETLK                8
 #define F_SETLKW       9
 
-#define F_GETLK64      12      /*  using 'struct flock64' */
-#define F_SETLK64      13
-#define F_SETLKW64     14
-
 /* for posix fcntl() and lockf() */
 #define F_RDLCK                1
 #define F_WRLCK                2
 #define F_UNLCK                3
 
-struct flock64 {
-       short l_type;
-       short l_whence;
-       loff_t l_start;
-       loff_t l_len;
-       pid_t l_pid;
-       short __unused;
-};
-
 #define __ARCH_FLOCK_PAD       short __unused;
+#define __ARCH_FLOCK64_PAD     short __unused;
 
 #include <asm-generic/fcntl.h>