diff --git a/[refs] b/[refs]
index 0853320fce6c..8287997bf00e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eafafb54bc594be8a23b00b25055b59838a9c79
+refs/heads/master: b4e1ded3cf6e13c122f019532cb60347d6c88c8c
diff --git a/trunk/include/asm-m32r/system.h b/trunk/include/asm-m32r/system.h
index b291b2f72954..8ee73d3f316d 100644
--- a/trunk/include/asm-m32r/system.h
+++ b/trunk/include/asm-m32r/system.h
@@ -10,6 +10,7 @@
  * Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
  */
 
+#include <linux/compiler.h>
 #include <asm/assembler.h>
 
 #ifdef __KERNEL__
@@ -154,7 +155,7 @@ extern void  __xchg_called_with_bad_pointer(void);
 #define DCACHE_CLEAR(reg0, reg1, addr)
 #endif	/* CONFIG_CHIP_M32700_TS1 */
 
-static inline unsigned long
+static __always_inline unsigned long
 __xchg(unsigned long x, volatile void * ptr, int size)
 {
 	unsigned long flags;