Hi: [PATCH] Make WARN_ON/WARN_ON_ONCE no-ops when CONFIG_BUG is off
The description of CONFIG_BUG clearly states that both BUG and WARN_ON may be skipped. However, our actual implementation still checks the condition on WARN_ON if it's used as part of an if statement or such. This patch makes it return 0 after evaluating the expression if CONFIG_BUG is disabled. This is consistent with the spirit of the CONFIG_BUG option. The same change is made to WARN_ON_ONCE. Signed-off-by: Herbert Xu <[EMAIL PROTECTED]> Thanks, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <[EMAIL PROTECTED]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index d56fedb..3e74278 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -43,6 +43,16 @@ struct bug_entry { }) #endif +#define WARN_ON_ONCE(condition) ({ \ + static int __warned; \ + int __ret_warn_once = !!(condition); \ + \ + if (unlikely(__ret_warn_once)) \ + if (WARN_ON(!__warned)) \ + __warned = 1; \ + unlikely(__ret_warn_once); \ +}) + #else /* !CONFIG_BUG */ #ifndef HAVE_ARCH_BUG #define BUG() @@ -53,22 +63,11 @@ struct bug_entry { #endif #ifndef HAVE_ARCH_WARN_ON -#define WARN_ON(condition) ({ \ - int __ret_warn_on = !!(condition); \ - unlikely(__ret_warn_on); \ -}) -#endif +#define WARN_ON(condition) ((condition), 0) #endif -#define WARN_ON_ONCE(condition) ({ \ - static int __warned; \ - int __ret_warn_once = !!(condition); \ - \ - if (unlikely(__ret_warn_once)) \ - if (WARN_ON(!__warned)) \ - __warned = 1; \ - unlikely(__ret_warn_once); \ -}) +#define WARN_ON_ONCE(condition) ((condition), 0) +#endif #ifdef CONFIG_SMP # define WARN_ON_SMP(x) WARN_ON(x) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
