X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fasm-m32r%2Fsystem.h;h=8ee73d3f316d1d7174f83169a704b0ea6032133a;hb=ec4883b015c3212f6f6d04fb2ff45f528492f598;hp=b291b2f729549d35589e8faf5198db364986731b;hpb=f7d02ae76ebbf5b8a9531fe150c49e126a397704;p=mv-sheeva.git

diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index b291b2f7295..8ee73d3f316 100644
--- a/include/asm-m32r/system.h
+++ b/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;