Pull battery into release branch

[linux-2.6-omap-h63xx.git] / include / asm-mips / cmpxchg.h

diff --git a/include/asm-mips/cmpxchg.h b/include/asm-mips/cmpxchg.h
index c5b4708e003bae30306871d477dd01f1abae87d8..a5ec0e5dc5b8ec303addaef2fe5fb52f0c9d5670 100644 (file)
--- a/include/asm-mips/cmpxchg.h
+++ b/include/asm-mips/cmpxchg.h
@@ -72,7 +72,7 @@
  */
 extern void __cmpxchg_called_with_bad_pointer(void);
 
-#define __cmpxchg(ptr,old,new,barrier)                                 \
+#define __cmpxchg(ptr, old, new, barrier)                              \
 ({                                                                     \
        __typeof__(ptr) __ptr = (ptr);                                  \
        __typeof__(*(ptr)) __old = (old);                               \
@@ -102,6 +102,6 @@ extern void __cmpxchg_called_with_bad_pointer(void);
 })
 
 #define cmpxchg(ptr, old, new)         __cmpxchg(ptr, old, new, smp_llsc_mb())
-#define cmpxchg_local(ptr, old, new)   __cmpxchg(ptr, old, new,)
+#define cmpxchg_local(ptr, old, new)   __cmpxchg(ptr, old, new, )
 
 #endif /* __ASM_CMPXCHG_H */