diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 22:37:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-17 21:41:39 -0700 |
| commit | 6d1f4b88ee73c9a073277dd1529fbbce356e04e8 (patch) | |
| tree | 22997bd68362deb4e2e77f9d038edc76774e678e /include/asm-sparc | |
| parent | e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a (diff) | |
| download | kernel_samsung_aries-6d1f4b88ee73c9a073277dd1529fbbce356e04e8.zip kernel_samsung_aries-6d1f4b88ee73c9a073277dd1529fbbce356e04e8.tar.gz kernel_samsung_aries-6d1f4b88ee73c9a073277dd1529fbbce356e04e8.tar.bz2 | |
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>
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/fcntl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h index 07bd2d8..d4d9c9d 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 */ |