Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

alpha: fixup BUG macro

Do usual do {} while (0) dance, otherwise

fs/gfs2/util.c:99: error: expected expression before 'else'
drivers/scsi/lpfc/lpfc_sli.c:363: error: expected expression before 'else'

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alexey Dobriyan and committed by
Linus Torvalds
fb9a6800 736d5453

+2 -2
+2 -2
arch/alpha/include/asm/bug.h
··· 8 8 9 9 /* ??? Would be nice to use .gprel32 here, but we can't be sure that the 10 10 function loaded the GP, so this could fail in modules. */ 11 - #define BUG() { \ 11 + #define BUG() do { \ 12 12 __asm__ __volatile__( \ 13 13 "call_pal %0 # bugchk\n\t" \ 14 14 ".long %1\n\t.8byte %2" \ 15 15 : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__)); \ 16 - for ( ; ; ); } 16 + for ( ; ; ); } while (0) 17 17 18 18 #define HAVE_ARCH_BUG 19 19 #endif