diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2006-09-27 04:50:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:18 -0400 |
commit | ebba5f9fcb882306bef7175dee987342ec6fcf2f (patch) | |
tree | a947175a24a3261ab3ffb5d9244e40939dd5495d /include/asm-sh64/unistd.h | |
parent | bd8e39f9e4c0960541c8c69e1f7cb321574d7c90 (diff) |
[PATCH] consistently use MAX_ERRNO in __syscall_return
Consistently use MAX_ERRNO when checking for errors in __syscall_return().
[ralf@linux-mips.org: build fix]
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-sh64/unistd.h')
-rw-r--r-- | include/asm-sh64/unistd.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h index 9a1590fffc15..c113566bef33 100644 --- a/include/asm-sh64/unistd.h +++ b/include/asm-sh64/unistd.h | |||
@@ -347,8 +347,10 @@ | |||
347 | #ifdef __KERNEL__ | 347 | #ifdef __KERNEL__ |
348 | 348 | ||
349 | #define NR_syscalls 321 | 349 | #define NR_syscalls 321 |
350 | #include <linux/err.h> | ||
350 | 351 | ||
351 | /* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */ | 352 | /* user-visible error numbers are in the range -1 - -MAX_ERRNO: |
353 | * see <asm-sh64/errno.h> */ | ||
352 | 354 | ||
353 | #define __syscall_return(type, res) \ | 355 | #define __syscall_return(type, res) \ |
354 | do { \ | 356 | do { \ |
@@ -358,7 +360,7 @@ do { \ | |||
358 | ** life easier in the system call epilogue (see entry.S) \ | 360 | ** life easier in the system call epilogue (see entry.S) \ |
359 | */ \ | 361 | */ \ |
360 | register unsigned long __sr2 __asm__ ("r2") = res; \ | 362 | register unsigned long __sr2 __asm__ ("r2") = res; \ |
361 | if ((unsigned long)(res) >= (unsigned long)(-125)) { \ | 363 | if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \ |
362 | errno = -(res); \ | 364 | errno = -(res); \ |
363 | __sr2 = -1; \ | 365 | __sr2 = -1; \ |
364 | } \ | 366 | } \ |