summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2007-08-08 22:17:08 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-09 17:39:22 +0200
commit620b5e68ee89ba1d3f017056857459dc21be8c7b (patch)
tree78981b55b2446c5a3cf0cb03715802928a8db1cf
parentMerge git://git.linux-nfs.org/pub/linux/nfs-2.6 (diff)
downloadlinux-620b5e68ee89ba1d3f017056857459dc21be8c7b.tar.xz
linux-620b5e68ee89ba1d3f017056857459dc21be8c7b.zip
Fix Alpha O_CLOEXEC definition
The default definition in asm-generic conflicts with Alpha's O_DIRECT, so, like several other arches, it needs to be redefined. Signed-off-by: Richard Hendersion <rth@twiddle.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-alpha/fcntl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-alpha/fcntl.h b/include/asm-alpha/fcntl.h
index 87f2cf459e26..25da0017ec87 100644
--- a/include/asm-alpha/fcntl.h
+++ b/include/asm-alpha/fcntl.h
@@ -16,6 +16,7 @@
#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 O_CLOEXEC 010000000 /* set close_on_exec */
#define F_GETLK 7
#define F_SETLK 8