diff options
Diffstat (limited to 'include/asm-powerpc/bug.h')
| -rw-r--r-- | include/asm-powerpc/bug.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h index f44b529e3298..978b2c7e84ea 100644 --- a/include/asm-powerpc/bug.h +++ b/include/asm-powerpc/bug.h | |||
| @@ -70,9 +70,10 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 70 | "i" (__FILE__), "i" (__FUNCTION__)); \ | 70 | "i" (__FILE__), "i" (__FUNCTION__)); \ |
| 71 | } while (0) | 71 | } while (0) |
| 72 | 72 | ||
| 73 | #define WARN_ON(x) do { \ | 73 | #define WARN_ON(x) ({ \ |
| 74 | if (__builtin_constant_p(x)) { \ | 74 | typeof(x) __ret_warn_on = (x); \ |
| 75 | if (x) \ | 75 | if (__builtin_constant_p(__ret_warn_on)) { \ |
| 76 | if (__ret_warn_on) \ | ||
| 76 | __WARN(); \ | 77 | __WARN(); \ |
| 77 | } else { \ | 78 | } else { \ |
| 78 | __asm__ __volatile__( \ | 79 | __asm__ __volatile__( \ |
| @@ -80,11 +81,12 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 80 | ".section __bug_table,\"a\"\n" \ | 81 | ".section __bug_table,\"a\"\n" \ |
| 81 | "\t"PPC_LONG" 1b,%1,%2,%3\n" \ | 82 | "\t"PPC_LONG" 1b,%1,%2,%3\n" \ |
| 82 | ".previous" \ | 83 | ".previous" \ |
| 83 | : : "r" ((long)(x)), \ | 84 | : : "r" (__ret_warn_on), \ |
| 84 | "i" (__LINE__ + BUG_WARNING_TRAP), \ | 85 | "i" (__LINE__ + BUG_WARNING_TRAP), \ |
| 85 | "i" (__FILE__), "i" (__FUNCTION__)); \ | 86 | "i" (__FILE__), "i" (__FUNCTION__)); \ |
| 86 | } \ | 87 | } \ |
| 87 | } while (0) | 88 | unlikely(__ret_warn_on); \ |
| 89 | }) | ||
| 88 | 90 | ||
| 89 | #define HAVE_ARCH_BUG | 91 | #define HAVE_ARCH_BUG |
| 90 | #define HAVE_ARCH_BUG_ON | 92 | #define HAVE_ARCH_BUG_ON |