diff --git a/[refs] b/[refs]
index f3c7b7e56601..28789193af1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 644595f89620ba8446cc555be336d24a34464950
+refs/heads/master: ff88943a1471440cc6be7a11a942a5a8232bee61
diff --git a/trunk/include/linux/aio_abi.h b/trunk/include/linux/aio_abi.h
index 2c8731664180..86fa7a71336a 100644
--- a/trunk/include/linux/aio_abi.h
+++ b/trunk/include/linux/aio_abi.h
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
-typedef unsigned long	aio_context_t;
+typedef __kernel_ulong_t aio_context_t;
 
 enum {
 	IOCB_CMD_PREAD = 0,