[zaptel-commits] qwell: trunk r2810 - in /trunk: ./ zaptel.c

[SVN commits to the Zaptel project]

Author: qwell
Date: Wed Aug  1 15:22:26 2007
New Revision: 2810

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

................
r2809 | qwell | 2007-08-01 15:21:32 -0500 (Wed, 01 Aug 2007) | 10 lines

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

........
r2808 | qwell | 2007-08-01 15:21:04 -0500 (Wed, 01 Aug 2007) | 2 lines

Per Matt Fredrickson, we don't want to use GFP_KERNEL while holding a spinlock.

........

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

Modified:
    trunk/   (props changed)
    trunk/zaptel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?view=diff&rev=2810&r1=2809&r2=2810
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Wed Aug  1 15:22:26 2007
@@ -4001,7 +4001,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);