Commit 828bb5f4 authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds

[PATCH] Add `unlikely' to error-return path in v850 __syscall_return macro

Add `unlikely' to error-return path in v850 __syscall_return macro
parent 4c9bebab
...@@ -239,11 +239,18 @@ ...@@ -239,11 +239,18 @@
#define SYSCALL_SHORT_CLOBBERS SYSCALL_CLOBBERS, "r13", "r14" #define SYSCALL_SHORT_CLOBBERS SYSCALL_CLOBBERS, "r13", "r14"
/* User programs sometimes end up including this header file
(indirectly, via uClibc header files), so I'm a bit nervous just
including <linux/compiler.h>. */
#if !defined(__builtin_expect) && __GNUC__ == 2 && __GNUC_MINOR__ < 96
#define __builtin_expect(x, expected_value) (x)
#endif
#define __syscall_return(type, res) \ #define __syscall_return(type, res) \
do { \ do { \
/* user-visible error numbers are in the range -1 - -124: \ /* user-visible error numbers are in the range -1 - -124: \
see <asm-v850/errno.h> */ \ see <asm-v850/errno.h> */ \
if ((unsigned long)(res) >= (unsigned long)(-125)) { \ if (__builtin_expect ((unsigned long)(res) >= (unsigned long)(-125), 0)) { \
errno = -(res); \ errno = -(res); \
res = -1; \ res = -1; \
} \ } \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment