git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-i386
/
futex.h
diff --git
a/include/asm-i386/futex.h
b/include/asm-i386/futex.h
index
7b8ceef
..
946d97c
100644
(file)
--- a/
include/asm-i386/futex.h
+++ b/
include/asm-i386/futex.h
@@
-20,8
+20,8
@@
.align 8\n\
.long 1b,3b\n\
.previous" \
.align 8\n\
.long 1b,3b\n\
.previous" \
- : "=r" (oldval), "=r" (ret), "
=
m" (*uaddr) \
- : "i" (-EFAULT), "
m" (*uaddr), "
0" (oparg), "1" (0))
+ : "=r" (oldval), "=r" (ret), "
+
m" (*uaddr) \
+ : "i" (-EFAULT), "0" (oparg), "1" (0))
#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
__asm__ __volatile ( \
#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
__asm__ __volatile ( \
@@
-38,9
+38,9
@@
.align 8\n\
.long 1b,4b,2b,4b\n\
.previous" \
.align 8\n\
.long 1b,4b,2b,4b\n\
.previous" \
- : "=&a" (oldval), "=&r" (ret), "
=
m" (*uaddr), \
+ : "=&a" (oldval), "=&r" (ret), "
+
m" (*uaddr), \
"=&r" (tem) \
"=&r" (tem) \
- : "r" (oparg), "i" (-EFAULT), "
m" (*uaddr), "
1" (0))
+ : "r" (oparg), "i" (-EFAULT), "1" (0))
static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
@@
-123,7
+123,7
@@
futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
" .long 1b,3b \n"
" .previous \n"
" .long 1b,3b \n"
" .previous \n"
- : "=a" (oldval), "
=
m" (*uaddr)
+ : "=a" (oldval), "
+
m" (*uaddr)
: "i" (-EFAULT), "r" (newval), "0" (oldval)
: "memory"
);
: "i" (-EFAULT), "r" (newval), "0" (oldval)
: "memory"
);