diff --git a/[refs] b/[refs]
index de1a248d3097..08077aab9441 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b631c2de63b4475351258197409983c8189ed04
+refs/heads/master: f94d1d3a1df125461a16b2888eca46d64f113e3a
diff --git a/trunk/include/asm-m32r/system.h b/trunk/include/asm-m32r/system.h
index 7e7eb3703d85..70a57c8c002b 100644
--- a/trunk/include/asm-m32r/system.h
+++ b/trunk/include/asm-m32r/system.h
@@ -127,9 +127,7 @@ static inline void local_irq_disable(void)
 	((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr),	\
 			sizeof(*(ptr))))
 
-#ifdef CONFIG_SMP
 extern void  __xchg_called_with_bad_pointer(void);
-#endif
 
 #ifdef CONFIG_CHIP_M32700_TS1
 #define DCACHE_CLEAR(reg0, reg1, addr)				\
@@ -189,9 +187,9 @@ __xchg(unsigned long x, volatile void *ptr, int size)
 #endif	/* CONFIG_CHIP_M32700_TS1 */
 		);
 		break;
+#endif  /* CONFIG_SMP */
 	default:
 		__xchg_called_with_bad_pointer();
-#endif  /* CONFIG_SMP */
 	}
 
 	local_irq_restore(flags);