sparc: Merge asm-sparc{,64}/fcntl.h

The definition of O_NDELAY differed - the rest was equal

:$ diff -u include/asm-sparc/fcntl.h include/asm-sparc64/fcntl.h
:-- include/asm-sparc/fcntl.h	2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/fcntl.h	2008-06-13 06:46:39.000000000 +0200
:@@ -1,8 +1,9 @@
:-#ifndef _SPARC_FCNTL_H
:-#define _SPARC_FCNTL_H
:+#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 */
:@@ -10,7 +11,6 @@
: #define O_EXCL		0x0800	/* not fcntl */
: #define O_SYNC		0x2000
: #define O_NONBLOCK	0x4000
:-#define O_NDELAY	(0x0004 | O_NONBLOCK)
: #define O_NOCTTY	0x8000	/* not fcntl */
: #define O_LARGEFILE	0x40000
: #define O_DIRECT        0x100000 /* direct disk access hint */
:@@ -29,8 +29,7 @@
: #define F_UNLCK		3
:
: #define __ARCH_FLOCK_PAD	short __unused;
:-#define __ARCH_FLOCK64_PAD	short __unused;
:
: #include <asm-generic/fcntl.h>
:
:-#endif
:+#endif /* !(_SPARC64_FCNTL_H) */

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

2 files changed, 5 insertions, 35 deletions

diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 07bd2d80257f..d4d9c9d852c3 100644
--- a/include/asm-sparc/fcntl.h
+++ b/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/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
index 8a09ca7aa2f2..8b1beae48cd1 100644
--- a/include/asm-sparc64/fcntl.h
+++ b/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>