diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-11-11 22:26:27 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-12 15:25:56 (GMT) |
commit | 71ccb83cfc487354d2647e315c8196e5872198ab (patch) | |
tree | 412436ad5744718820e4907d9fb6dbc9497309bb /include/keys | |
parent | e00e431612c3a6e437a01f2129fd3843da0c982a (diff) | |
download | linux-fsl-qoriq-71ccb83cfc487354d2647e315c8196e5872198ab.tar.xz |
alpha: fix F_SETOWN_EX and F_GETLK64 conflict
Fix a bug in
commit ba0a6c9f6fceed11c6a99e8326f0477fe383e6b5
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
AuthorDate: Wed Sep 23 15:57:03 2009 -0700
Commit: Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Thu Sep 24 07:21:01 2009 -0700
fcntl: add F_[SG]ETOWN_EX
In asm-generic/fcntl.h, F_SETOWN_EX and F_GETLK64 both have value 12, and
F_GETOWN_EX and F_SETLK64 both have value 13.
Reported-by: "Joseph S. Myers" <joseph@codesourcery.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Andreas Schwab <schwab@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ulrich Drepper <drepper@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/keys')
0 files changed, 0 insertions, 0 deletions