projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...
[cascardo/linux.git]
/
include
/
asm-mips
/
futex.h
diff --git
a/include/asm-mips/futex.h
b/include/asm-mips/futex.h
index
b623882
..
17f082c
100644
(file)
--- a/
include/asm-mips/futex.h
+++ b/
include/asm-mips/futex.h
@@
-35,7
+35,7
@@
" .set mips0 \n" \
" .section .fixup,\"ax\" \n" \
"4: li %0, %6 \n" \
" .set mips0 \n" \
" .section .fixup,\"ax\" \n" \
"4: li %0, %6 \n" \
- " j
2
b \n" \
+ " j
3
b \n" \
" .previous \n" \
" .section __ex_table,\"a\" \n" \
" "__UA_ADDR "\t1b, 4b \n" \
" .previous \n" \
" .section __ex_table,\"a\" \n" \
" "__UA_ADDR "\t1b, 4b \n" \
@@
-61,7
+61,7
@@
" .set mips0 \n" \
" .section .fixup,\"ax\" \n" \
"4: li %0, %6 \n" \
" .set mips0 \n" \
" .section .fixup,\"ax\" \n" \
"4: li %0, %6 \n" \
- " j
2
b \n" \
+ " j
3
b \n" \
" .previous \n" \
" .section __ex_table,\"a\" \n" \
" "__UA_ADDR "\t1b, 4b \n" \
" .previous \n" \
" .section __ex_table,\"a\" \n" \
" "__UA_ADDR "\t1b, 4b \n" \
@@
-75,7
+75,7
@@
}
static inline int
}
static inline int
-futex_atomic_op_inuser
(int encoded_op, int __user *uaddr)
+futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
{
int op = (encoded_op >> 28) & 7;
int cmp = (encoded_op >> 24) & 15;
{
int op = (encoded_op >> 28) & 7;
int cmp = (encoded_op >> 24) & 15;
@@
-200,4
+200,4
@@
futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
}
#endif
}
#endif
-#endif
+#endif
/* _ASM_FUTEX_H */