Index: linux-2.6.20-rc6-mm2/net/sunrpc/svc.c
===================================================================
--- linux-2.6.20-rc6-mm2.orig/net/sunrpc/svc.c	2007-01-29 14:18:41.000000000 -0600
+++ linux-2.6.20-rc6-mm2/net/sunrpc/svc.c	2007-01-29 14:27:26.047143067 -0600
@@ -115,7 +115,7 @@ fail:
 static int
 svc_pool_map_init_percpu(struct svc_pool_map *m)
 {
-	unsigned int maxpools = nr_node_ids;
+	unsigned int maxpools = highest_possible_processor_id()+1;
 	unsigned int pidx = 0;
 	unsigned int cpu;
 	int err;