From: Richard Henderson <rth@twiddle.net>
Date: Wed, 8 Aug 2007 20:17:08 +0000 (-0700)
Subject: Fix Alpha O_CLOEXEC definition
X-Git-Tag: v2.6.23-rc3~67
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=620b5e68ee89ba1d3f017056857459dc21be8c7b;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/include/asm-alpha/fcntl.h b/include/asm-alpha/fcntl.h
index 87f2cf459e2..25da0017ec8 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