[zaptel-commits] kpfleming: trunk r2121 - in /trunk: ./ wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Feb  7 15:26:36 2007
New Revision: 2121

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2121
Log:
Merged revisions 2120 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2120 | kpfleming | 2007-02-07 15:25:30 -0600 (Wed, 07 Feb 2007) | 10 lines

Merged revisions 2119 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2119 | kpfleming | 2007-02-07 15:22:44 -0600 (Wed, 07 Feb 2007) | 2 lines

don't allow wct4xxp workqueue support to be built against kernel 2.6.20... it's not going to work

........

................

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/base.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Feb  7 15:26:36 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087,2099,2105,2107,2111
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087,2099,2105,2107,2111,2120

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=2121&r1=2120&r2=2121
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Wed Feb  7 15:26:36 2007
@@ -66,7 +66,7 @@
 /* #define ENABLE_TASKLETS */
 
 /* Work queues are a way to better distribute load on SMP systems */
-#ifdef LINUX26
+#if defined(LINUX26) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
 /*
  * Work queues can significantly improve performance and scalability
  * on multi-processor machines, but requires bypassing some kernel