diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:38:55 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:38:55 -0800 |
commit | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (patch) | |
tree | 20b2dada6ef16126c8e4c372d65790cc5b757b86 /arch/alpha/include/asm/bug.h | |
parent | 70e66a5079b2b33f142303d31581cf03f7af98fe (diff) | |
parent | acadbfb90a54673d6c8b05aa4e93218433890411 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Convert BUG() to use unreachable()
alpha: Add minimal support for software performance events
alpha: Wire up missing/new syscalls
Diffstat (limited to 'arch/alpha/include/asm/bug.h')
-rw-r--r-- | arch/alpha/include/asm/bug.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/bug.h b/arch/alpha/include/asm/bug.h index 1720c8ad86f..f091682e3cc 100644 --- a/arch/alpha/include/asm/bug.h +++ b/arch/alpha/include/asm/bug.h @@ -13,7 +13,8 @@ "call_pal %0 # bugchk\n\t" \ ".long %1\n\t.8byte %2" \ : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__)); \ - for ( ; ; ); } while (0) + unreachable(); \ + } while (0) #define HAVE_ARCH_BUG #endif |