diff --git a/[refs] b/[refs]
index 9cfd6c44f2cb..a4c16bf4c75b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e589ed23dd27b890900eb7514f0a9e297d1e02b5
+refs/heads/master: d81030a1badb4e4d08358ff2c2bda9b11d5a6559
diff --git a/trunk/arch/arm/include/asm/bug.h b/trunk/arch/arm/include/asm/bug.h
index 7b62351f097d..4d88425a4169 100644
--- a/trunk/arch/arm/include/asm/bug.h
+++ b/trunk/arch/arm/include/asm/bug.h
@@ -12,7 +12,7 @@ extern void __bug(const char *file, int line) __attribute__((noreturn));
 #else
 
 /* this just causes an oops */
-#define BUG()		(*(int *)0 = 0)
+#define BUG()		do { *(int *)0 = 0; } while (1)
 
 #endif