diff --git a/[refs] b/[refs]
index 0177daa1b629..ca93cda2a2d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fbf6e507888da902b02a3c4f5f493fab1071312
+refs/heads/master: 609588928fae2c977c887d6d31b1f0aae60ea09e
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 2f9266406afc..2ff814272dcf 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -1493,7 +1493,7 @@ static int nfsiod_start(void)
 {
 	struct workqueue_struct *wq;
 	dprintk("RPC:       creating workqueue nfsiod\n");
-	wq = create_singlethread_workqueue("nfsiod");
+	wq = alloc_workqueue("nfsiod", WQ_RESCUER, 0);
 	if (wq == NULL)
 		return -ENOMEM;
 	nfsiod_workqueue = wq;