diff options
| -rw-r--r-- | drivers/dahdi/wctc4xxp/base.c | 14 | ||||
| -rw-r--r-- | 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) |