[zaptel-commits] qwell: branch 1.2 r2808 - /branches/1.2/zaptel-base.c

[SVN commits to the Zaptel project]

Author: qwell
Date: Wed Aug  1 15:21:04 2007
New Revision: 2808

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2808
Log:
Per Matt Fredrickson, we don't want to use GFP_KERNEL while holding a spinlock.

Modified:
    branches/1.2/zaptel-base.c

Modified: branches/1.2/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel-base.c?view=diff&rev=2808&r1=2807&r2=2808
==============================================================================
--- branches/1.2/zaptel-base.c (original)
+++ branches/1.2/zaptel-base.c Wed Aug  1 15:21:04 2007
@@ -3883,7 +3883,7 @@
 			if ((stack.conf.confmode & ZT_CONF_MODE_MASK) == ZT_CONF_MONITOR_RX_PREECHO ||
 			    (stack.conf.confmode & ZT_CONF_MODE_MASK) == ZT_CONF_MONITOR_TX_PREECHO ||
 			    (stack.conf.confmode & ZT_CONF_MODE_MASK) == ZT_CONF_MONITORBOTH_PREECHO)
-				chans[stack.conf.confno]->readchunkpreec = kmalloc(sizeof(*chans[stack.conf.confno]->readchunkpreec) * ZT_CHUNKSIZE, GFP_KERNEL);
+				chans[stack.conf.confno]->readchunkpreec = kmalloc(sizeof(*chans[stack.conf.confno]->readchunkpreec) * ZT_CHUNKSIZE, GFP_ATOMIC);
 			else {
 				if (chans[stack.conf.confno]->readchunkpreec) {
 					kfree(chans[stack.conf.confno]->readchunkpreec);