diff --git a/[refs] b/[refs]
index e3393492eb7c..efcd7cb2daf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28c3cfd5fb998bd3683bebeebbba38baa2101cad
+refs/heads/master: 4ab4ba32aa16b012cb0faabf1a27952508fe67f2
diff --git a/trunk/include/asm-x86/syscall.h b/trunk/include/asm-x86/syscall.h
index 6f293892895a..04c47dc5597c 100644
--- a/trunk/include/asm-x86/syscall.h
+++ b/trunk/include/asm-x86/syscall.h
@@ -14,6 +14,7 @@
 #define _ASM_SYSCALL_H	1
 
 #include <linux/sched.h>
+#include <linux/err.h>
 
 static inline long syscall_get_nr(struct task_struct *task,
 				  struct pt_regs *regs)
@@ -47,7 +48,7 @@ static inline long syscall_get_error(struct task_struct *task,
 		 */
 		error = (long) (int) error;
 #endif
-	return error >= -4095L ? error : 0;
+	return IS_ERR_VALUE(error) ? error : 0;
 }
 
 static inline long syscall_get_return_value(struct task_struct *task,