Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

[linux-2.6-omap-h63xx.git] / include / asm-x86 / syscall.h

diff --git a/include/asm-x86/syscall.h b/include/asm-x86/syscall.h
index 6f293892895ac3ba7ca9c7f053e6415194c81f5e..04c47dc5597cf9f002408ca2590210b0477fa74b 100644 (file)
--- a/include/asm-x86/syscall.h
+++ b/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,