diff --git a/[refs] b/[refs]
index d25ccfc89409..45f6d58454de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e115f2c17cbceee93b34d787a7a4a867fc73e7b4
+refs/heads/master: 74db2479c1fecefd0a190f282f28f00565309807
diff --git a/trunk/arch/sh/include/asm/bug.h b/trunk/arch/sh/include/asm/bug.h
index 23c5504a3a01..d02c01b3e6b9 100644
--- a/trunk/arch/sh/include/asm/bug.h
+++ b/trunk/arch/sh/include/asm/bug.h
@@ -98,6 +98,11 @@ do {							\
 	unlikely(__ret_unwinder_on);				\
 })
 
+#else
+
+#define UNWINDER_BUG	BUG
+#define UNWINDER_BUG_ON	BUG_ON
+
 #endif /* CONFIG_GENERIC_BUG */
 
 #include <asm-generic/bug.h>