Merge commit 'v2.6.29' into core/header-fixes

[mirror_ubuntu-eoan-kernel.git] / include / asm-generic / fcntl.h

diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index b663520dcdc487531caea8fbed1908fefa0f5754..4d3e48373e74eee4ce2881bc56442c7ef59409c3 100644 (file)
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -1,7 +1,6 @@
 #ifndef _ASM_GENERIC_FCNTL_H
 #define _ASM_GENERIC_FCNTL_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 
 /* open/fcntl - O_SYNC is only implemented on blocks devices and on files
@@ -49,6 +48,9 @@
 #ifndef O_NOATIME
 #define O_NOATIME      01000000
 #endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC      02000000        /* set close_on_exec */
+#endif
 #ifndef O_NDELAY
 #define O_NDELAY       O_NONBLOCK
 #endif
@@ -115,9 +117,9 @@
 struct flock {
        short   l_type;
        short   l_whence;
-       off_t   l_start;
-       off_t   l_len;
-       pid_t   l_pid;
+       __kernel_off_t  l_start;
+       __kernel_off_t  l_len;
+       __kernel_pid_t  l_pid;
        __ARCH_FLOCK_PAD
 };
 #endif
@@ -138,9 +140,9 @@ struct flock {
 struct flock64 {
        short  l_type;
        short  l_whence;
-       loff_t l_start;
-       loff_t l_len;
-       pid_t  l_pid;
+       __kernel_loff_t l_start;
+       __kernel_loff_t l_len;
+       __kernel_pid_t  l_pid;
        __ARCH_FLOCK64_PAD
 };
 #endif