From 81eb49536a7590a07efb1de425ddd935ff27db90 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Thu, 21 Aug 2008 23:09:48 +0100
Subject: [PATCH] --- yaml --- r: 112278 b: refs/heads/master c:
 d81030a1badb4e4d08358ff2c2bda9b11d5a6559 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/include/asm/bug.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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