Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Xtensa: use asm-generic/fcntl.h

Commit fc4fb2adf944d45a7f3d4d38df991c79ffdb6a43 "fixed" the Xtensa
asm/fcntl.h and in doing so ignored asm-generic/fcntl.h completely.
It turns out that it is now exactly the same as asm-generic/fcntl.h.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Chris Zankel <zankel@tensilica.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Stephen Rothwell and committed by
Chris Zankel
df5e3870 29c4dfd9

+1 -99
+1 -99
include/asm-xtensa/fcntl.h
··· 1 - /* 2 - * include/asm-xtensa/fcntl.h 3 - * 4 - * This file is subject to the terms and conditions of the GNU General Public 5 - * License. See the file "COPYING" in the main directory of this archive 6 - * for more details. 7 - * 8 - * Copyright (C) 1995, 1996, 1997, 1998 by Ralf Baechle 9 - * Copyright (C) 2001 - 2005 Tensilica Inc. 10 - */ 11 - 12 - #ifndef _XTENSA_FCNTL_H 13 - #define _XTENSA_FCNTL_H 14 - 15 - /* open/fcntl - O_SYNC is only implemented on blocks devices and on files 16 - located on an ext2 file system */ 17 - #define O_ACCMODE 0003 18 - #define O_RDONLY 00 19 - #define O_WRONLY 01 20 - #define O_RDWR 02 21 - #define O_CREAT 0100 /* not fcntl */ 22 - #define O_EXCL 0200 /* not fcntl */ 23 - #define O_NOCTTY 0400 /* not fcntl */ 24 - #define O_TRUNC 01000 /* not fcntl */ 25 - #define O_APPEND 02000 26 - #define O_NONBLOCK 04000 27 - #define O_NDELAY O_NONBLOCK 28 - #define O_SYNC 010000 29 - #define FASYNC 020000 /* fcntl, for BSD compatibility */ 30 - #define O_DIRECT 040000 /* direct disk access hint */ 31 - #define O_LARGEFILE 0100000 32 - #define O_DIRECTORY 0200000 /* must be a directory */ 33 - #define O_NOFOLLOW 0400000 /* don't follow links */ 34 - #define O_NOATIME 01000000 35 - 36 - #define F_DUPFD 0 /* dup */ 37 - #define F_GETFD 1 /* get close_on_exec */ 38 - #define F_SETFD 2 /* set/clear close_on_exec */ 39 - #define F_GETFL 3 /* get file->f_flags */ 40 - #define F_SETFL 4 /* set file->f_flags */ 41 - #define F_GETLK 5 42 - #define F_SETLK 6 43 - #define F_SETLKW 7 44 - 45 - #define F_SETOWN 8 /* for sockets. */ 46 - #define F_GETOWN 9 /* for sockets. */ 47 - #define F_SETSIG 10 /* for sockets. */ 48 - #define F_GETSIG 11 /* for sockets. */ 49 - 50 - #define F_GETLK64 12 /* using 'struct flock64' */ 51 - #define F_SETLK64 13 52 - #define F_SETLKW64 14 53 - 54 - /* for F_[GET|SET]FL */ 55 - #define FD_CLOEXEC 1 /* actually anything with low bit set goes */ 56 - 57 - /* for posix fcntl() and lockf() */ 58 - #define F_RDLCK 0 59 - #define F_WRLCK 1 60 - #define F_UNLCK 2 61 - 62 - /* for old implementation of bsd flock () */ 63 - #define F_EXLCK 4 /* or 3 */ 64 - #define F_SHLCK 8 /* or 4 */ 65 - 66 - /* for leases */ 67 - #define F_INPROGRESS 16 68 - 69 - /* operations for bsd flock(), also used by the kernel implementation */ 70 - #define LOCK_SH 1 /* shared lock */ 71 - #define LOCK_EX 2 /* exclusive lock */ 72 - #define LOCK_NB 4 /* or'd with one of the above to prevent 73 - blocking */ 74 - #define LOCK_UN 8 /* remove lock */ 75 - 76 - #define LOCK_MAND 32 /* This is a mandatory flock */ 77 - #define LOCK_READ 64 /* ... Which allows concurrent read operations */ 78 - #define LOCK_WRITE 128 /* ... Which allows concurrent write operations */ 79 - #define LOCK_RW 192 /* ... Which allows concurrent read & write ops */ 80 - 81 - struct flock { 82 - short l_type; 83 - short l_whence; 84 - off_t l_start; 85 - off_t l_len; 86 - pid_t l_pid; 87 - }; 88 - 89 - struct flock64 { 90 - short l_type; 91 - short l_whence; 92 - loff_t l_start; 93 - loff_t l_len; 94 - pid_t l_pid; 95 - }; 96 - 97 - #define F_LINUX_SPECIFIC_BASE 1024 98 - 99 - #endif /* _XTENSA_FCNTL_H */ 1 + #include <asm-generic/fcntl.h>