| From bad60f6730c4047c1a033948852b7bdf95172fdd Mon Sep 17 00:00:00 2001 |
| From: Ingo Molnar <mingo@elte.hu> |
| Date: Fri, 3 Jul 2009 08:29:58 -0500 |
| Subject: [PATCH] rt: BUG_ON/WARN_ON variants dependend on RT/!RT |
| |
| commit c15ac58e50a3e202f6c663b31c5536fdbaea9968 in tip. |
| |
| [ tglx: folded compile fix from Tsutomu Owa <tsutomu.owa@toshiba.co.jp> ] |
| |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h |
| index 18c435d..a4141a5 100644 |
| --- a/include/asm-generic/bug.h |
| +++ b/include/asm-generic/bug.h |
| @@ -3,6 +3,10 @@ |
| |
| #include <linux/compiler.h> |
| |
| +#ifndef __ASSEMBLY__ |
| +extern void __WARN_ON(const char *func, const char *file, const int line); |
| +#endif /* __ASSEMBLY__ */ |
| + |
| #ifdef CONFIG_BUG |
| |
| #ifdef CONFIG_GENERIC_BUG |
| @@ -141,4 +145,18 @@ extern void warn_slowpath_null(const char *file, const int line); |
| # define WARN_ON_SMP(x) do { } while (0) |
| #endif |
| |
| +#ifdef CONFIG_PREEMPT_RT |
| +# define BUG_ON_RT(c) BUG_ON(c) |
| +# define BUG_ON_NONRT(c) do { } while (0) |
| +# define WARN_ON_RT(condition) WARN_ON(condition) |
| +# define WARN_ON_NONRT(condition) do { } while (0) |
| +# define WARN_ON_ONCE_NONRT(condition) do { } while (0) |
| +#else |
| +# define BUG_ON_RT(c) do { } while (0) |
| +# define BUG_ON_NONRT(c) BUG_ON(c) |
| +# define WARN_ON_RT(condition) do { } while (0) |
| +# define WARN_ON_NONRT(condition) WARN_ON(condition) |
| +# define WARN_ON_ONCE_NONRT(condition) WARN_ON_ONCE(condition) |
| +#endif |
| + |
| #endif |
| -- |
| 1.7.1.1 |
| |
