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);