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-m32r | |
| 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-m32r')
| -rw-r--r-- | include/asm-m32r/unistd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h index 89f376e6229f..5c6a9ac6cf1a 100644 --- a/include/asm-m32r/unistd.h +++ b/include/asm-m32r/unistd.h | |||
| @@ -296,8 +296,9 @@ | |||
| 296 | #ifdef __KERNEL__ | 296 | #ifdef __KERNEL__ |
| 297 | 297 | ||
| 298 | #define NR_syscalls 285 | 298 | #define NR_syscalls 285 |
| 299 | #include <linux/err.h> | ||
| 299 | 300 | ||
| 300 | /* user-visible error numbers are in the range -1 - -124: see | 301 | /* user-visible error numbers are in the range -1 - -MAX_ERRNO: see |
| 301 | * <asm-m32r/errno.h> | 302 | * <asm-m32r/errno.h> |
| 302 | */ | 303 | */ |
| 303 | 304 | ||
| @@ -305,7 +306,7 @@ | |||
| 305 | 306 | ||
| 306 | #define __syscall_return(type, res) \ | 307 | #define __syscall_return(type, res) \ |
| 307 | do { \ | 308 | do { \ |
| 308 | if ((unsigned long)(res) >= (unsigned long)(-(124 + 1))) { \ | 309 | if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \ |
| 309 | /* Avoid using "res" which is declared to be in register r0; \ | 310 | /* Avoid using "res" which is declared to be in register r0; \ |
| 310 | errno might expand to a function call and clobber it. */ \ | 311 | errno might expand to a function call and clobber it. */ \ |
| 311 | int __err = -(res); \ | 312 | int __err = -(res); \ |
