diff --git a/[refs] b/[refs]
index 70b55d9d46aa..c171af346243 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd34ef9bc44b87d746b7178e9c4ba51163b46884
+refs/heads/master: 21cb20d758254e68a369ba83c721f8ce083e6659
diff --git a/trunk/arch/sh/include/asm/kgdb.h b/trunk/arch/sh/include/asm/kgdb.h
index 00485198f598..9e7d2d1b03e0 100644
--- a/trunk/arch/sh/include/asm/kgdb.h
+++ b/trunk/arch/sh/include/asm/kgdb.h
@@ -23,10 +23,15 @@ static inline void arch_kgdb_breakpoint(void)
 	__asm__ __volatile__ ("trapa #0x3c\n");
 }
 
-#define BUFMAX                 2048
-
-#define CACHE_FLUSH_IS_SAFE	1
 #define BREAK_INSTR_SIZE	2
+#define BUFMAX			2048
+
+#ifdef CONFIG_SMP
+# define CACHE_FLUSH_IS_SAFE	0
+#else
+# define CACHE_FLUSH_IS_SAFE	1
+#endif
+
 #define GDB_ADJUSTS_BREAK_OFFSET
 
 #endif /* __ASM_SH_KGDB_H */