Merge branch 'master' into tk71

[mv-sheeva.git] / include / asm-generic / fcntl.h

diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index a70b2d2bfc14f70940d08bcaef7fac4e185308c9..0fc16e3f0bfcc01e0f4e9016f82b0b5387d5317a 100644 (file)
--- 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 */