diff options
| -rw-r--r-- | arch/ia64/include/asm/futex.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/futex.h b/arch/ia64/include/asm/futex.h index 0ab82cc2dc8f..d2bf1fd5e44f 100644 --- a/arch/ia64/include/asm/futex.h +++ b/arch/ia64/include/asm/futex.h | |||
| @@ -106,15 +106,16 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | |||
| 106 | return -EFAULT; | 106 | return -EFAULT; |
| 107 | 107 | ||
| 108 | { | 108 | { |
| 109 | register unsigned long r8 __asm ("r8") = 0; | 109 | register unsigned long r8 __asm ("r8"); |
| 110 | unsigned long prev; | 110 | unsigned long prev; |
| 111 | __asm__ __volatile__( | 111 | __asm__ __volatile__( |
| 112 | " mf;; \n" | 112 | " mf;; \n" |
| 113 | " mov ar.ccv=%3;; \n" | 113 | " mov %0=r0 \n" |
| 114 | "[1:] cmpxchg4.acq %0=[%1],%2,ar.ccv \n" | 114 | " mov ar.ccv=%4;; \n" |
| 115 | "[1:] cmpxchg4.acq %1=[%2],%3,ar.ccv \n" | ||
| 115 | " .xdata4 \"__ex_table\", 1b-., 2f-. \n" | 116 | " .xdata4 \"__ex_table\", 1b-., 2f-. \n" |
| 116 | "[2:]" | 117 | "[2:]" |
| 117 | : "=r" (prev) | 118 | : "=r" (r8), "=r" (prev) |
| 118 | : "r" (uaddr), "r" (newval), | 119 | : "r" (uaddr), "r" (newval), |
| 119 | "rO" ((long) (unsigned) oldval) | 120 | "rO" ((long) (unsigned) oldval) |
| 120 | : "memory"); | 121 | : "memory"); |