alpha: fix the BUG() macro
authorIvan Kokshaysky <ink@jurassic.park.msu.ru>
Thu, 29 Jan 2009 22:25:20 +0000 (14:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:04:44 +0000 (18:04 -0800)
The commit "alpha: teach the compiler that BUG doesn't return"
(ed6b9b97f42c091630335bfb71a2931e6f86388b) moved the asm code into inline
function which takes __FILE__ and __LINE__ as arguments.  This violates
asm constrains there ("i" - an immediate operand with constant value), so
that compile may result in warning or error, depending on compiler
version.

Just adding an infinite loop to the BUG() is sufficient.

Signed-off-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>
arch/alpha/include/asm/bug.h

index 695a5ee4b5d3da464ed25bab5668bcc861de1479..7b85b7c93709f9c584b678ff9d2b3f3cb9fd5b0a 100644 (file)
@@ -8,17 +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.  */
-static inline void ATTRIB_NORET __BUG(const char *file, int line)
-{
-       __asm__ __volatile__(
-               "call_pal %0  # bugchk\n\t"
-               ".long %1\n\t.8byte %2"
-                      : : "i" (PAL_bugchk), "i"(line), "i"(file));
-       for ( ; ; )
-               ;
-}
-
-#define BUG() __BUG(__FILE__, __LINE__)
+#define BUG()  {                                                       \
+       __asm__ __volatile__(                                           \
+               "call_pal %0  # bugchk\n\t"                             \
+               ".long %1\n\t.8byte %2"                                 \
+               : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__));     \
+       for ( ; ; ); }
 
 #define HAVE_ARCH_BUG
 #endif