summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-12-19 17:22:49 +0000
committersruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-12-19 17:22:49 +0000
commit88b50165b1cacb1bfffe5ffcbaa6db0bce8dbe3c (patch)
treef5935abe81b117f90dd3e77a16af853df94153dc
parent389a44aa12edaa7a89ae4a534a6fc2e9c3cacc83 (diff)
WARN is defined in newer kernels. Use WARN_ALWAYS like in DAHDI.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4598 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--kernel/wctc4xxp/base.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/wctc4xxp/base.c b/kernel/wctc4xxp/base.c
index cfa0d30..4ba40e6 100644
--- a/kernel/wctc4xxp/base.c
+++ b/kernel/wctc4xxp/base.c
@@ -60,7 +60,7 @@
# define ALLOC_FLAGS GFP_KERNEL
#endif
-#define WARN() WARN_ON(1)
+#define WARN_ALWAYS() WARN_ON(1)
#define DTE_PRINTK(_lvl, _fmt, _args...) \
printk(KERN_##_lvl "%s: %s: " _fmt, THIS_MODULE->name, \
@@ -2212,7 +2212,7 @@ wctc4xxp_start_dma(struct wcdte *wc)
for (i = 0; i < DRING_SIZE; ++i) {
if (!(cmd = alloc_cmd())) {
- WARN();
+ WARN_ALWAYS();
return;
}
cmd->data_len = SFRAME_SIZE;
@@ -2220,7 +2220,7 @@ wctc4xxp_start_dma(struct wcdte *wc)
/* When we're starting the DMA, we should always be
* able to fill the ring....so something is wrong
* here. */
- WARN();
+ WARN_ALWAYS();
free_cmd(cmd);
break;
}
@@ -2734,7 +2734,7 @@ wctc4xxp_setup_channels(struct wcdte *wc)
{
int ret;
if ((ret=down_interruptible(&wc->chansem))) {
- WARN();
+ WARN_ALWAYS();
return ret;
}
ret = __wctc4xxp_setup_channels(wc);