From fd57a511c118b9b91194cc99519a2c612d1dad73 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 21 Feb 2013 17:25:41 +0000 Subject: [PATCH] --- yaml --- r: 370747 b: refs/heads/master c: 576be13092ede98f3c0400ca7a6f6ac715a27a22 h: refs/heads/master i: 370745: 8314632d57bc3d931dc220823e10fb15d8367a23 370743: 39185d34647ec523f0bd04387acf8b7ccd647150 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/bitops.h | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a01a0926657c..ebf9e889cdd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad18a364f186e085ea3194c1900d970d0cee8fad +refs/heads/master: 576be13092ede98f3c0400ca7a6f6ac715a27a22 diff --git a/trunk/arch/powerpc/include/asm/bitops.h b/trunk/arch/powerpc/include/asm/bitops.h index 08bd299c75b1..910194e9a1e2 100644 --- a/trunk/arch/powerpc/include/asm/bitops.h +++ b/trunk/arch/powerpc/include/asm/bitops.h @@ -53,7 +53,7 @@ #define smp_mb__after_clear_bit() smp_mb() /* Macro for generating the ***_bits() functions */ -#define DEFINE_BITOP(fn, op, prefix, postfix) \ +#define DEFINE_BITOP(fn, op, prefix) \ static __inline__ void fn(unsigned long mask, \ volatile unsigned long *_p) \ { \ @@ -66,16 +66,15 @@ static __inline__ void fn(unsigned long mask, \ PPC405_ERR77(0,%3) \ PPC_STLCX "%0,0,%3\n" \ "bne- 1b\n" \ - postfix \ : "=&r" (old), "+m" (*p) \ : "r" (mask), "r" (p) \ : "cc", "memory"); \ } -DEFINE_BITOP(set_bits, or, "", "") -DEFINE_BITOP(clear_bits, andc, "", "") -DEFINE_BITOP(clear_bits_unlock, andc, PPC_RELEASE_BARRIER, "") -DEFINE_BITOP(change_bits, xor, "", "") +DEFINE_BITOP(set_bits, or, "") +DEFINE_BITOP(clear_bits, andc, "") +DEFINE_BITOP(clear_bits_unlock, andc, PPC_RELEASE_BARRIER) +DEFINE_BITOP(change_bits, xor, "") static __inline__ void set_bit(int nr, volatile unsigned long *addr) {