From 8ddd3c9d8f760c1407e4a4c22ff6698ffb225c9b Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@infradead.org>
Date: Tue, 16 Oct 2007 23:29:32 -0700
Subject: [PATCH] --- yaml --- r: 70659 b: refs/heads/master c:
 d9aacccf457d07d729cfc7bf20ff0c7428357a9f h: refs/heads/master i:   70657:
 7c76325573936234a442f980aef338e8d14d43ed   70655:
 8cebdcc8a85483c6e710809fdb4e9f12dcac0e69 v: v3

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

diff --git a/[refs] b/[refs]
index e1977d60b391..d2c74ea2166e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e8934695dfd1d5013555a74a9da706a2e301cb0
+refs/heads/master: d9aacccf457d07d729cfc7bf20ff0c7428357a9f
diff --git a/trunk/drivers/base/dmapool.c b/trunk/drivers/base/dmapool.c
index 7647abfe1890..fbae8674e491 100644
--- a/trunk/drivers/base/dmapool.c
+++ b/trunk/drivers/base/dmapool.c
@@ -302,7 +302,7 @@ dma_pool_alloc (struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle)
 		if (mem_flags & __GFP_WAIT) {
 			DECLARE_WAITQUEUE (wait, current);
 
-			current->state = TASK_INTERRUPTIBLE;
+			__set_current_state(TASK_INTERRUPTIBLE);
 			add_wait_queue (&pool->waitq, &wait);
 			spin_unlock_irqrestore (&pool->lock, flags);