From fc9c5ba631f23c7cea70da4ca78c12017df4feef Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 5 Jun 2008 22:37:04 +0200
Subject: [PATCH] --- yaml --- r: 104151 b: refs/heads/master c:
 6d1f4b88ee73c9a073277dd1529fbbce356e04e8 h: refs/heads/master i:   104149:
 3fb45aa35320b537ddeb4ba8ae8da0f359c6df4b   104147:
 31b3e9c73723af57803da5ab9e9ee6a7af76bf1c   104143:
 7f93a7667d813f1e10fd70ae44a1733f06f8ae9a v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-sparc/fcntl.h   |  4 ++++
 trunk/include/asm-sparc64/fcntl.h | 36 +------------------------------
 3 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/[refs] b/[refs]
index 0c09e1a3ecf5..420295482076 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a
+refs/heads/master: 6d1f4b88ee73c9a073277dd1529fbbce356e04e8
diff --git a/trunk/include/asm-sparc/fcntl.h b/trunk/include/asm-sparc/fcntl.h
index 07bd2d80257f..d4d9c9d852c3 100644
--- a/trunk/include/asm-sparc/fcntl.h
+++ b/trunk/include/asm-sparc/fcntl.h
@@ -10,7 +10,11 @@
 #define O_EXCL		0x0800	/* not fcntl */
 #define O_SYNC		0x2000
 #define O_NONBLOCK	0x4000
+#if defined(__sparc__) && defined(__arch64__)
+#define O_NDELAY	0x0004
+#else
 #define O_NDELAY	(0x0004 | O_NONBLOCK)
+#endif
 #define O_NOCTTY	0x8000	/* not fcntl */
 #define O_LARGEFILE	0x40000
 #define O_DIRECT        0x100000 /* direct disk access hint */
diff --git a/trunk/include/asm-sparc64/fcntl.h b/trunk/include/asm-sparc64/fcntl.h
index 8a09ca7aa2f2..8b1beae48cd1 100644
--- a/trunk/include/asm-sparc64/fcntl.h
+++ b/trunk/include/asm-sparc64/fcntl.h
@@ -1,35 +1 @@
-#ifndef _SPARC64_FCNTL_H
-#define _SPARC64_FCNTL_H
-
-/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
-   located on an ext2 file system */
-#define O_NDELAY	0x0004
-#define O_APPEND	0x0008
-#define FASYNC		0x0040	/* fcntl, for BSD compatibility */
-#define O_CREAT		0x0200	/* not fcntl */
-#define O_TRUNC		0x0400	/* not fcntl */
-#define O_EXCL		0x0800	/* not fcntl */
-#define O_SYNC		0x2000
-#define O_NONBLOCK	0x4000
-#define O_NOCTTY	0x8000	/* not fcntl */
-#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. */
-#define F_GETLK		7
-#define F_SETLK		8
-#define F_SETLKW	9
-
-/* for posix fcntl() and lockf() */
-#define F_RDLCK		1
-#define F_WRLCK		2
-#define F_UNLCK		3
-
-#define __ARCH_FLOCK_PAD	short __unused;
-
-#include <asm-generic/fcntl.h>
-
-#endif /* !(_SPARC64_FCNTL_H) */
+#include <asm-sparc/fcntl.h>