Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 168569
b: refs/heads/master
c: 71ccb83
h: refs/heads/master
i:
  168567: 0810027
v: v3
  • Loading branch information
Peter Zijlstra authored and Linus Torvalds committed Nov 12, 2009
1 parent 5d9f710 commit b516481
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e00e431612c3a6e437a01f2129fd3843da0c982a
refs/heads/master: 71ccb83cfc487354d2647e315c8196e5872198ab
4 changes: 2 additions & 2 deletions trunk/arch/alpha/include/asm/fcntl.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#define F_GETOWN 6 /* for sockets. */
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */
#define F_SETOWN_EX 12
#define F_GETOWN_EX 13
#define F_SETOWN_EX 15
#define F_GETOWN_EX 16

/* for posix fcntl() and lockf() */
#define F_RDLCK 1
Expand Down
19 changes: 11 additions & 8 deletions trunk/include/asm-generic/fcntl.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,18 @@
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */
#endif

#ifndef CONFIG_64BIT
#ifndef F_GETLK64
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
#endif
#endif

#ifndef F_SETOWN_EX
#define F_SETOWN_EX 12
#define F_GETOWN_EX 13
#define F_SETOWN_EX 15
#define F_GETOWN_EX 16
#endif

#define F_OWNER_TID 0
Expand Down Expand Up @@ -139,12 +148,6 @@ struct flock {

#ifndef CONFIG_64BIT

#ifndef F_GETLK64
#define F_GETLK64 12 /* using 'struct flock64' */
#define F_SETLK64 13
#define F_SETLKW64 14
#endif

#ifndef HAVE_ARCH_STRUCT_FLOCK64
#ifndef __ARCH_FLOCK64_PAD
#define __ARCH_FLOCK64_PAD
Expand Down

0 comments on commit b516481

Please sign in to comment.