diff --git a/[refs] b/[refs] index a3bf4d2446ce..cd8df7b37218 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d263b213577a1e8f166b0a7212d85175e36d6c19 +refs/heads/master: e4b522d7ef144fb2ad6a4cb23d9cb5ec154be8bc diff --git a/trunk/include/asm-i386/atomic.h b/trunk/include/asm-i386/atomic.h index 51a166242522..6aab7a105fad 100644 --- a/trunk/include/asm-i386/atomic.h +++ b/trunk/include/asm-i386/atomic.h @@ -187,9 +187,9 @@ static __inline__ int atomic_add_return(int i, atomic_t *v) /* Modern 486+ processor */ __i = i; __asm__ __volatile__( - LOCK_PREFIX "xaddl %0, %1;" - :"=r"(i) - :"m"(v->counter), "0"(i)); + LOCK_PREFIX "xaddl %0, %1" + :"+r" (i), "+m" (v->counter) + : : "memory"); return i + __i; #ifdef CONFIG_M386