OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5dd0bb
)
microblaze: Reversed logic in futex cmpxchg
author
Meyer, Kirk
<Kirk.Meyer@sencore.com>
Thu, 23 May 2013 17:06:57 +0000
(17:06 +0000)
committer
Michal Simek
<michal.simek@xilinx.com>
Mon, 27 May 2013 10:29:35 +0000
(12:29 +0200)
futex_atomic_cmpxchg_inatomic exchanged if the values were
unequal rather than equal. This caused incorrect behavior
of robust futexes.
Signed-off-by: Kirk Meyer <kirk.meyer@sencore.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/microblaze/include/asm/futex.h
patch
|
blob
|
history
diff --git
a/arch/microblaze/include/asm/futex.h
b/arch/microblaze/include/asm/futex.h
index
ff8cde1
..
01848f0
100644
(file)
--- a/
arch/microblaze/include/asm/futex.h
+++ b/
arch/microblaze/include/asm/futex.h
@@
-105,7
+105,7
@@
futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
__asm__ __volatile__ ("1: lwx %1, %3, r0; \
cmp %2, %1, %4; \
- b
eq
i %2, 3f; \
+ b
ne
i %2, 3f; \
2: swx %5, %3, r0; \
addic %2, r0, 0; \
bnei %2, 1b; \