From 943c6dcd4d994222d91702a4a63ff843a8365974 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 4 Jul 2011 15:30:55 +1000 Subject: [PATCH] --- yaml --- r: 259075 b: refs/heads/master c: 35de674982aa13de98cf470c640895164017563e h: refs/heads/master i: 259073: 7e3c231b295e5eb1e720f3a859295e8d08accccc 259071: 7ea23c9bcc745b1b74d1dc0fd85bc5d4d694b719 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/atomic.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6e29aa73f4b0..a3c65c08b891 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3c23a28ace0a42ea06b5860b3bd25f71fc14c89 +refs/heads/master: 35de674982aa13de98cf470c640895164017563e diff --git a/trunk/arch/m68k/include/asm/atomic.h b/trunk/arch/m68k/include/asm/atomic.h index 03ae3d14cd4a..307a573881ad 100644 --- a/trunk/arch/m68k/include/asm/atomic.h +++ b/trunk/arch/m68k/include/asm/atomic.h @@ -169,18 +169,18 @@ static inline int atomic_add_negative(int i, atomic_t *v) char c; __asm__ __volatile__("addl %2,%1; smi %0" : "=d" (c), "+m" (*v) - : "id" (i)); + : ASM_DI (i)); return c != 0; } static inline void atomic_clear_mask(unsigned long mask, unsigned long *v) { - __asm__ __volatile__("andl %1,%0" : "+m" (*v) : "id" (~(mask))); + __asm__ __volatile__("andl %1,%0" : "+m" (*v) : ASM_DI (~(mask))); } static inline void atomic_set_mask(unsigned long mask, unsigned long *v) { - __asm__ __volatile__("orl %1,%0" : "+m" (*v) : "id" (mask)); + __asm__ __volatile__("orl %1,%0" : "+m" (*v) : ASM_DI (mask)); } static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)