diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:17:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:17:06 -0700 |
| commit | db08bf0877f3464fb0c2c37dcdd9f9683192ea26 (patch) | |
| tree | c9d47587ac07cb1622156899414c78f097fcb0c9 /include/asm-generic/fcntl.h | |
| parent | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (diff) | |
| parent | 35dbc0e020c6587f78a6c17693beca73aead7b54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic/io.h: allow people to override individual funcs
bitops: remove duplicated extern declarations
bitops: make asm-generic/bitops/find.h more generic
asm-generic: kdebug.h: Checkpatch cleanup
asm-generic: fcntl: make exported headers use strict posix types
asm-generic: cmpxchg does not handle non-long arguments
asm-generic: make atomic_add_unless a function
Diffstat (limited to 'include/asm-generic/fcntl.h')
| -rw-r--r-- | include/asm-generic/fcntl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index a70b2d2bfc14..0fc16e3f0bfc 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h @@ -122,7 +122,7 @@ struct f_owner_ex { int type; - pid_t pid; + __kernel_pid_t pid; }; /* for F_[GET|SET]FL */ |