diff --git a/[refs] b/[refs]
index 5a1752ac2b97..bf4d0d933775 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6691126636769bd22bfd7b55829f0373a93c1ce
+refs/heads/master: 269b8fd5d058f2c0da01a42b20315ffc2640d99b
diff --git a/trunk/include/asm-generic/fcntl.h b/trunk/include/asm-generic/fcntl.h
index a70b2d2bfc14..0fc16e3f0bfc 100644
--- a/trunk/include/asm-generic/fcntl.h
+++ b/trunk/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 */