From: Hirokazu Takata <takata@linux-m32r.org>
This patch updates include/asm-m32r/system.h.
* include/asm-m32r/system.h:
- Use barrier() as mb().
- Change __inline__ to inline.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/include/asm-m32r/system.h | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff -puN include/asm-m32r/system.h~m32r-update-include-asm-m32r-systemh include/asm-m32r/system.h
--- 25/include/asm-m32r/system.h~m32r-update-include-asm-m32r-systemh Fri Dec 17 15:30:50 2004
+++ 25-akpm/include/asm-m32r/system.h Fri Dec 17 15:30:50 2004
@@ -7,6 +7,7 @@
* for more details.
*
* Copyright (C) 2001 by Hiroyuki Kondo, Hirokazu Takata, and Hitoshi Yamamoto
+ * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org>
*/
#include <linux/config.h>
@@ -73,7 +74,7 @@
#define local_irq_disable() \
__asm__ __volatile__ ("clrpsw #0x40 -> nop": : :"memory")
#else /* CONFIG_CHIP_M32102 */
-static __inline__ void local_irq_enable(void)
+static inline void local_irq_enable(void)
{
unsigned long tmpreg;
__asm__ __volatile__(
@@ -83,7 +84,7 @@ static __inline__ void local_irq_enable(
: "=&r" (tmpreg) : : "cbit", "memory");
}
-static __inline__ void local_irq_disable(void)
+static inline void local_irq_disable(void)
{
unsigned long tmpreg0, tmpreg1;
__asm__ __volatile__(
@@ -219,11 +220,7 @@ static __inline__ unsigned long __xchg(u
* rmb() prevents loads being reordered across this point.
* wmb() prevents stores being reordered across this point.
*/
-#if 0
-#define mb() __asm__ __volatile__ ("push r0; \n\t pop r0;" : : : "memory")
-#else
-#define mb() __asm__ __volatile__ ("" : : : "memory")
-#endif
+#define mb() barrier()
#define rmb() mb()
#define wmb() mb()
@@ -298,4 +295,3 @@ static __inline__ unsigned long __xchg(u
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
#endif /* _ASM_M32R_SYSTEM_H */
-
_