Merge commit 'v2.6.29' into core/header-fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/alpha/include/asm/bug.h b/arch/alpha/include/asm/bug.h
index 7b85b7c93709..1720c8ad86fe 100644
--- a/arch/alpha/include/asm/bug.h
+++ b/arch/alpha/include/asm/bug.h
@@ -8,12 +8,12 @@
 
 /* ??? Would be nice to use .gprel32 here, but we can't be sure that the
    function loaded the GP, so this could fail in modules.  */
-#define BUG()   {                                                       \
+#define BUG()   do {                                                    \
         __asm__ __volatile__(                                           \
                 "call_pal %0  # bugchk\n\t"                             \
                 ".long %1\n\t.8byte %2"                                 \
                 : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__));     \
-        for ( ; ; ); }
+        for ( ; ; ); } while (0)
 
 #define HAVE_ARCH_BUG
 #endif