From 9d6354a215539fffb82f38b297f61bdfa7b89e92 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 13 Jan 2011 15:47:25 -0800
Subject: [PATCH] --- yaml --- r: 230820 b: refs/heads/master c:
 684265d4a30f133162f06ddb2e5010608e60e4bb h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/dmapool.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c00684091f58..1afc27623d66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84bc227d7fde049a568cd58a5610613feedc0dff
+refs/heads/master: 684265d4a30f133162f06ddb2e5010608e60e4bb
diff --git a/trunk/mm/dmapool.c b/trunk/mm/dmapool.c
index a2f6295b4df4..03bf3bb4519a 100644
--- a/trunk/mm/dmapool.c
+++ b/trunk/mm/dmapool.c
@@ -324,7 +324,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
 		if (mem_flags & __GFP_WAIT) {
 			DECLARE_WAITQUEUE(wait, current);
 
-			__set_current_state(TASK_INTERRUPTIBLE);
+			__set_current_state(TASK_UNINTERRUPTIBLE);
 			__add_wait_queue(&pool->waitq, &wait);
 			spin_unlock_irqrestore(&pool->lock, flags);