Skip to content

Commit

Permalink
sh: fixed cmpxchg gRB version
Browse files Browse the repository at this point in the history
This patch fixes a bug within the cmpxchg GRB version.

A problem was notices while running some tests to stress
the priority inheritance, for example pi_stress
(http://rt.wiki.kernel.org/index.php/PI_Mutex_Test).

Also, without this patch, after applying the latest work to
consolidate atomic_cmpxchg() definitions (commit:
8c0b813)
the Kernel doesn't boot at all.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Giuseppe CAVALLARO authored and Paul Mundt committed Jan 27, 2010
1 parent 660e2ac commit 7013109
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions arch/sh/include/asm/cmpxchg-grb.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
" mov.l @%1, %0 \n\t" /* load old value */
" cmp/eq %0, %2 \n\t"
" bf 1f \n\t" /* if not equal */
" mov.l %2, @%1 \n\t" /* store new value */
" mov.l %3, @%1 \n\t" /* store new value */
"1: mov r1, r15 \n\t" /* LOGOUT */
: "=&r" (retval),
"+r" (m)
: "r" (new)
: "=&r" (retval)
: "r" (m), "r" (old), "r" (new)
: "memory" , "r0", "r1", "t");

return retval;
Expand Down

0 comments on commit 7013109

Please sign in to comment.