diff --git a/[refs] b/[refs]
index 433913806dbb..8caeb55e32ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f4b67b8ff707147e14ee71045ab25aa286520f2
+refs/heads/master: d94d4adb7dd05b4e25f3c317a1b932ec74272a12
diff --git a/trunk/arch/sh/include/asm/perf_counter.h b/trunk/arch/sh/include/asm/perf_counter.h
index a8153c2aa6fa..61c2b40c802c 100644
--- a/trunk/arch/sh/include/asm/perf_counter.h
+++ b/trunk/arch/sh/include/asm/perf_counter.h
@@ -2,6 +2,6 @@
 #define __ASM_SH_PERF_COUNTER_H
 
 /* SH only supports software counters through this interface. */
-#define set_perf_counter_pending()	do { } while (0)
+static inline void set_perf_counter_pending(void) {}
 
 #endif /* __ASM_SH_PERF_COUNTER_H */