diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /arch/alpha/include/asm/bug.h | |
parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/alpha/include/asm/bug.h')
-rw-r--r-- | arch/alpha/include/asm/bug.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/alpha/include/asm/bug.h b/arch/alpha/include/asm/bug.h index 695a5ee4b5d..7b85b7c9370 100644 --- a/arch/alpha/include/asm/bug.h +++ b/arch/alpha/include/asm/bug.h | |||
@@ -8,17 +8,12 @@ | |||
8 | 8 | ||
9 | /* ??? Would be nice to use .gprel32 here, but we can't be sure that the | 9 | /* ??? Would be nice to use .gprel32 here, but we can't be sure that the |
10 | function loaded the GP, so this could fail in modules. */ | 10 | function loaded the GP, so this could fail in modules. */ |
11 | static inline void ATTRIB_NORET __BUG(const char *file, int line) | 11 | #define BUG() { \ |
12 | { | 12 | __asm__ __volatile__( \ |
13 | __asm__ __volatile__( | 13 | "call_pal %0 # bugchk\n\t" \ |
14 | "call_pal %0 # bugchk\n\t" | 14 | ".long %1\n\t.8byte %2" \ |
15 | ".long %1\n\t.8byte %2" | 15 | : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__)); \ |
16 | : : "i" (PAL_bugchk), "i"(line), "i"(file)); | 16 | for ( ; ; ); } |
17 | for ( ; ; ) | ||
18 | ; | ||
19 | } | ||
20 | |||
21 | #define BUG() __BUG(__FILE__, __LINE__) | ||
22 | 17 | ||
23 | #define HAVE_ARCH_BUG | 18 | #define HAVE_ARCH_BUG |
24 | #endif | 19 | #endif |