From 35ffe2f550feaf8ce0461b1dcc2b9021700b2604 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 21 Oct 2011 19:32:25 +0000 Subject: [PATCH] dahdi: Move WARN_ON_ONCE from wctc4xxp driver to include/dahdi/kernel.h I only generally test on RHEL 4 when testing against kernels older than 2.6.18. Apparently OpenSUSE 10.1 runs with 2.6.16 and doesn't have WARN_ON_ONCE backported. I took the patch Richard Miller originally attached to the issue and moved it to include/dahdi/kernel.h so it would be available for all the board drivers in the future. Internal-Issue-ID: DAHLIN-260 Reported-by: Richard Miller Signed-off-by: Shaun Ruffell git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10252 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctc4xxp/base.c | 14 -------------- include/dahdi/kernel.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 78bd09a..3bc2cd3 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -73,20 +73,6 @@ dev_info(&(wc)->pdev->dev, _fmt, ## _args); \ } \ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) -#ifndef WARN_ON_ONCE -#define WARN_ON_ONCE(__condition) do { \ - static int __once = 1; \ - if (unlikely(__condition)) { \ - if (__once) { \ - __once = 0; \ - WARN_ON(0); \ - } \ - } \ -} while (0) -#endif -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14) /* also added in RHEL kernels with the OpenInfiniband backport: */ #if LINUX_VERSION_CODE != KERNEL_VERSION(2, 6, 9) || !defined(DEFINE_SPINLOCK) diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index c392e64..9ae9d1e 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1380,6 +1380,19 @@ static inline void list_replace(struct list_head *old, struct list_head *new) new->prev = old->prev; new->prev->next = new; } + +#ifndef WARN_ON_ONCE +#define WARN_ON_ONCE(__condition) do { \ + static int __once = 1; \ + if (unlikely(__condition)) { \ + if (__once) { \ + __once = 0; \ + WARN_ON(0); \ + } \ + } \ +} while (0) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14) #define kzalloc(a, b) kcalloc(1, a, b) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)