From d5f4f5fbcffe32654f811c82efc881d1c10fbb10 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 19 Sep 2008 04:16:23 -0700
Subject: [PATCH] --- yaml --- r: 116295 b: refs/heads/master c:
 6fdb8bd47111d3f94be221082b725ec2dec1d5c7 h: refs/heads/master i:   116293:
 e40aef20c795422762c1854a494e3546e5a4d515   116291:
 4b2cff58dba154f944605cc30e29236b603f5e98   116287:
 ce40a856199aa924c82f039c7dddac0f32d6ae81 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/dma/dmatest.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4b38db10d498..2536804e6b5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b3141962dc82cfe1c30afdf91d564b309859cbe
+refs/heads/master: 6fdb8bd47111d3f94be221082b725ec2dec1d5c7
diff --git a/trunk/drivers/dma/dmatest.c b/trunk/drivers/dma/dmatest.c
index 422500c6c163..d1e381e35a9e 100644
--- a/trunk/drivers/dma/dmatest.c
+++ b/trunk/drivers/dma/dmatest.c
@@ -330,7 +330,7 @@ static enum dma_state_client dmatest_add_channel(struct dma_chan *chan)
 		if (dtc->chan == chan)
 			return DMA_DUP;
 
-	dtc = kmalloc(sizeof(struct dmatest_chan), GFP_ATOMIC);
+	dtc = kmalloc(sizeof(struct dmatest_chan), GFP_KERNEL);
 	if (!dtc) {
 		pr_warning("dmatest: No memory for %s\n", chan->dev.bus_id);
 		return DMA_NAK;