diff options
| author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-01 20:22:26 +0000 |
|---|---|---|
| committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-01 20:22:26 +0000 |
| commit | 183cf9c2af77e6444450cf5d2b5c62ca6b875fbe (patch) | |
| tree | 19a5eacb2baa34fea02634ffb77aa4dfa8258409 | |
| parent | f85c3104b6ba263be89d89f3ba0fbcae5d1ad495 (diff) | |
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.
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2810 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | zaptel.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4001,7 +4001,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); |