---

yaml --- r: 150209 b: refs/heads/master c: 3977d03 h: refs/heads/master i: 150207: ea865d3 v: v3
git-mirror · May 17, 2009 · 1acfc9a · 1acfc9a
1 parent dce5f26
commit 1acfc9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb1c4b71f6da18fa98bab4af055f391d01bee8ba
+refs/heads/master: 3977d0334b98770b81dfeb248db232c9bb3d3c88
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
@@ -894,9 +894,9 @@ static int efx_wanted_rx_queues(void)
 	int count;
 	int cpu;
 
-	if (!alloc_cpumask_var(&core_mask, GFP_KERNEL)) {
+	if (unlikely(!alloc_cpumask_var(&core_mask, GFP_KERNEL))) {
 		printk(KERN_WARNING
-		       "efx.c: allocation failure, irq balancing hobbled\n");
+		       "sfc: RSS disabled due to allocation failure\n");
 		return 1;
 	}