projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.103' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
s390
/
include
/
asm
/
syscall.h
diff --git
a/arch/s390/include/asm/syscall.h
b/arch/s390/include/asm/syscall.h
index bebc0bd8abc2e55be7472b1f07b677cb03656d04..25b4b1f0c0ce2e4c436517e48966fc11faaf27c8 100644
(file)
--- a/
arch/s390/include/asm/syscall.h
+++ b/
arch/s390/include/asm/syscall.h
@@
-54,7
+54,7
@@
static inline void syscall_set_return_value(struct task_struct *task,
struct pt_regs *regs,
int error, long val)
{
- regs->gprs[2] = error ?
-
error : val;
+ regs->gprs[2] = error ? error : val;
}
static inline void syscall_get_arguments(struct task_struct *task,