diff --git a/[refs] b/[refs]
index a927c41d4d8e..0398d1b5265a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e52da357a15db9e12b96b4e40dffe6b9e54bb976
+refs/heads/master: c96a6d41aa033c03b43e5a09448bddcc971797b1
diff --git a/trunk/include/asm-x86/compat.h b/trunk/include/asm-x86/compat.h
index d3e8f3e87ee8..1793ac317a30 100644
--- a/trunk/include/asm-x86/compat.h
+++ b/trunk/include/asm-x86/compat.h
@@ -204,7 +204,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
 	return (u32)(unsigned long)uptr;
 }
 
-static __inline__ void __user *compat_alloc_user_space(long len)
+static inline void __user *compat_alloc_user_space(long len)
 {
 	struct pt_regs *regs = task_pt_regs(current);
 	return (void __user *)regs->sp - len;