diff options
| author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-01 20:21:32 +0000 |
|---|---|---|
| committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-01 20:21:32 +0000 |
| commit | d6799cd73bc7567c3e35aeb80b3b86d2322d194a (patch) | |
| tree | 5d05913359fd6822b7de07cb0380517946239312 /zaptel-base.c | |
| parent | 3e131c35c93b441b039fd0f1e2cf6277438d41c9 (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2809 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel-base.c')
| -rw-r--r-- | zaptel-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zaptel-base.c b/zaptel-base.c index 1d8b143..64763c5 100644 --- a/zaptel-base.c +++ b/zaptel-base.c @@ -4000,7 +4000,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); |