diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-14 04:45:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 12:13:43 -0500 |
commit | a08e37f31aa2800e0c9d20e1fc9283a06901cac2 (patch) | |
tree | 55e208042c93ba2ee4e24e85fdb967e00c6f4e41 | |
parent | a9366e61b03f55a6e009e687ad10e706714c9907 (diff) |
fcntl: Use consistent values for F_[GS]ETOWN_EX
These values were only introduced during this release cycle, so it is
still early enough to get them right.
alpha uses the same values that are in asm-generic/fcntl.h, so just
remove them.
parisc uses the values interchanged for no apparent reason, so remove
them to give us consistency across all architectures.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/include/asm/fcntl.h | 2 | ||||
-rw-r--r-- | arch/parisc/include/asm/fcntl.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h index 73126e4dd639..25da0017ec87 100644 --- a/arch/alpha/include/asm/fcntl.h +++ b/arch/alpha/include/asm/fcntl.h | |||
@@ -26,8 +26,6 @@ | |||
26 | #define F_GETOWN 6 /* for sockets. */ | 26 | #define F_GETOWN 6 /* for sockets. */ |
27 | #define F_SETSIG 10 /* for sockets. */ | 27 | #define F_SETSIG 10 /* for sockets. */ |
28 | #define F_GETSIG 11 /* for sockets. */ | 28 | #define F_GETSIG 11 /* for sockets. */ |
29 | #define F_SETOWN_EX 15 | ||
30 | #define F_GETOWN_EX 16 | ||
31 | 29 | ||
32 | /* for posix fcntl() and lockf() */ | 30 | /* for posix fcntl() and lockf() */ |
33 | #define F_RDLCK 1 | 31 | #define F_RDLCK 1 |
diff --git a/arch/parisc/include/asm/fcntl.h b/arch/parisc/include/asm/fcntl.h index 5f39d5597ced..1e1c824764ee 100644 --- a/arch/parisc/include/asm/fcntl.h +++ b/arch/parisc/include/asm/fcntl.h | |||
@@ -28,8 +28,6 @@ | |||
28 | #define F_SETOWN 12 /* for sockets. */ | 28 | #define F_SETOWN 12 /* for sockets. */ |
29 | #define F_SETSIG 13 /* for sockets. */ | 29 | #define F_SETSIG 13 /* for sockets. */ |
30 | #define F_GETSIG 14 /* for sockets. */ | 30 | #define F_GETSIG 14 /* for sockets. */ |
31 | #define F_GETOWN_EX 15 | ||
32 | #define F_SETOWN_EX 16 | ||
33 | 31 | ||
34 | /* for posix fcntl() and lockf() */ | 32 | /* for posix fcntl() and lockf() */ |
35 | #define F_RDLCK 01 | 33 | #define F_RDLCK 01 |