diff options
Diffstat (limited to 'include/asm-avr32/bug.h')
-rw-r--r-- | include/asm-avr32/bug.h | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/include/asm-avr32/bug.h b/include/asm-avr32/bug.h index 521766bc9366..afdcd79a2966 100644 --- a/include/asm-avr32/bug.h +++ b/include/asm-avr32/bug.h | |||
@@ -18,27 +18,53 @@ | |||
18 | 18 | ||
19 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 19 | #ifdef CONFIG_DEBUG_BUGVERBOSE |
20 | 20 | ||
21 | #define BUG() \ | 21 | #define _BUG_OR_WARN(flags) \ |
22 | do { \ | 22 | asm volatile( \ |
23 | asm volatile(".hword %0\n\t" \ | 23 | "1: .hword %0\n" \ |
24 | ".hword %1\n\t" \ | 24 | " .section __bug_table,\"a\",@progbits\n" \ |
25 | ".long %2" \ | 25 | "2: .long 1b\n" \ |
26 | : \ | 26 | " .long %1\n" \ |
27 | : "n"(AVR32_BUG_OPCODE), \ | 27 | " .short %2\n" \ |
28 | "i"(__LINE__), "X"(__FILE__)); \ | 28 | " .short %3\n" \ |
29 | } while (0) | 29 | " .org 2b + %4\n" \ |
30 | " .previous" \ | ||
31 | : \ | ||
32 | : "i"(AVR32_BUG_OPCODE), "i"(__FILE__), \ | ||
33 | "i"(__LINE__), "i"(flags), \ | ||
34 | "i"(sizeof(struct bug_entry))) | ||
30 | 35 | ||
31 | #else | 36 | #else |
32 | 37 | ||
38 | #define _BUG_OR_WARN(flags) \ | ||
39 | asm volatile( \ | ||
40 | "1: .hword %0\n" \ | ||
41 | " .section __bug_table,\"a\",@progbits\n" \ | ||
42 | "2: .long 1b\n" \ | ||
43 | " .short %1\n" \ | ||
44 | " .org 2b + %2\n" \ | ||
45 | " .previous" \ | ||
46 | : \ | ||
47 | : "i"(AVR32_BUG_OPCODE), "i"(flags), \ | ||
48 | "i"(sizeof(struct bug_entry))) | ||
49 | |||
50 | #endif /* CONFIG_DEBUG_BUGVERBOSE */ | ||
51 | |||
33 | #define BUG() \ | 52 | #define BUG() \ |
34 | do { \ | 53 | do { \ |
35 | asm volatile(".hword %0\n\t" \ | 54 | _BUG_OR_WARN(0); \ |
36 | : : "n"(AVR32_BUG_OPCODE)); \ | 55 | for (;;); \ |
37 | } while (0) | 56 | } while (0) |
38 | 57 | ||
39 | #endif /* CONFIG_DEBUG_BUGVERBOSE */ | 58 | #define WARN_ON(condition) \ |
59 | ({ \ | ||
60 | typeof(condition) __ret_warn_on = (condition); \ | ||
61 | if (unlikely(__ret_warn_on)) \ | ||
62 | _BUG_OR_WARN(BUGFLAG_WARNING); \ | ||
63 | unlikely(__ret_warn_on); \ | ||
64 | }) | ||
40 | 65 | ||
41 | #define HAVE_ARCH_BUG | 66 | #define HAVE_ARCH_BUG |
67 | #define HAVE_ARCH_WARN_ON | ||
42 | 68 | ||
43 | #endif /* CONFIG_BUG */ | 69 | #endif /* CONFIG_BUG */ |
44 | 70 | ||