summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorDomen Puncer <domen.puncer@ultra.si>2006-06-23 11:59:50 +0200
committerRalf Baechle <ralf@linux-mips.org>2006-06-29 21:10:53 +0100
commitc06138941c2b5331e752546cf4ef7f4a2735ec99 (patch)
tree885ceec96ba260d3bd69b258aad866f1ac053a6a /arch/mips
parent38e9156147e5b0defb71a3eb7e9eff74609c496a (diff)
downloadlinux-c06138941c2b5331e752546cf4ef7f4a2735ec99.tar.gz
linux-c06138941c2b5331e752546cf4ef7f4a2735ec99.tar.bz2
linux-c06138941c2b5331e752546cf4ef7f4a2735ec99.zip
[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>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/au1000/common/dbdma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index 6ee090bd86c9..e8dd72cf860a 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;
}