From c672fbb982ba644e11ab9e5b6d883008b4004100 Mon Sep 17 00:00:00 2001 From: qwell Date: Wed, 1 Aug 2007 20:21:04 +0000 Subject: Per Matt Fredrickson, we don't want to use GFP_KERNEL while holding a spinlock. git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2808 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- zaptel-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaptel-base.c b/zaptel-base.c index 6166759..b4f429a 100644 --- a/zaptel-base.c +++ b/zaptel-base.c @@ -3883,7 +3883,7 @@ static int zt_chanandpseudo_ioctl(struct inode *inode, struct file *file, unsign 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); -- cgit v1.2.3