packages (LINUX_2_6_27): kernel/alpha-bug.patch - one more patch: Do usual ...

[glen]

Author: glen                         Date: Fri Mar 16 17:39:39 2012 GMT
Module: packages                      Tag: LINUX_2_6_27
---- Log message:
- one more patch: Do usual do {} while (0) dance, otherwise

---- Files affected:
packages/kernel:
   alpha-bug.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: packages/kernel/alpha-bug.patch
diff -u packages/kernel/alpha-bug.patch:1.1.2.2 packages/kernel/alpha-bug.patch:1.1.2.3
--- packages/kernel/alpha-bug.patch:1.1.2.2	Fri Mar 16 16:47:05 2012
+++ packages/kernel/alpha-bug.patch	Fri Mar 16 18:39:33 2012
@@ -53,3 +53,45 @@
 -- 
 1.7.5.4
 
+https://github.com/torvalds/linux/commit/fb9a68001175cc04bbbe711e6e29e1c6c353107b.patch
+From fb9a68001175cc04bbbe711e6e29e1c6c353107b Mon Sep 17 00:00:00 2001
+From: Alexey Dobriyan <adobriyan at gmail.com>
+Date: Wed, 4 Feb 2009 15:12:21 -0800
+Subject: [PATCH] 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 at gmail.com>
+Acked-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
+Cc: Richard Henderson <rth at twiddle.net>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ arch/alpha/include/asm/bug.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/alpha/include/asm/bug.h b/arch/alpha/include/asm/bug.h
+index 7b85b7c..1720c8a 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
+-- 
+1.7.5.4
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/alpha-bug.patch?r1=1.1.2.2&r2=1.1.2.3&f=u