From: Domen Puncer <domen.puncer@ultra.si>
Date: Fri, 23 Jun 2006 09:59:50 +0000 (+0200)
Subject: [MIPS] au1xxx: dbdma, no sleeping under spin_lock
X-Git-Tag: v2.6.18-rc1~353^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c06138941c2b5331e752546cf4ef7f4a2735ec99;p=linux-2.6-omap-h63xx.git

[MIPS] au1xxx: dbdma, no sleeping under spin_lock

kmalloc under spin_lock can't sleep.

Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index 6ee090bd86c..e8dd72cf860 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -290,7 +290,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
 				/* If kmalloc fails, it is caught below same
 				 * as a channel not available.
 				 */
-				ctp = kmalloc(sizeof(chan_tab_t), GFP_KERNEL);
+				ctp = kmalloc(sizeof(chan_tab_t), GFP_ATOMIC);
 				chan_tab_ptr[i] = ctp;
 				break;
 			}