diff --git a/[refs] b/[refs]
index 5d0c228a99ce..c84c2b311681 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f30dfbba1682fde22f5a728f23d97a7a59a39fa0
+refs/heads/master: 1bd58aaff44485ec9e3640af350f6ba1b33e2bec
diff --git a/trunk/net/sunrpc/svc.c b/trunk/net/sunrpc/svc.c
index 3ee7461926d8..664979bee1d2 100644
--- a/trunk/net/sunrpc/svc.c
+++ b/trunk/net/sunrpc/svc.c
@@ -324,7 +324,9 @@ svc_pool_map_set_cpumask(struct task_struct *task, unsigned int pidx)
 	 * The caller checks for sv_nrpools > 1, which
 	 * implies that we've been initialized.
 	 */
-	BUG_ON(m->count == 0);
+	WARN_ON_ONCE(m->count == 0);
+	if (m->count == 0)
+		return;
 
 	switch (m->mode) {
 	case SVC_POOL_PERCPU: