]> git.baikalelectronics.ru Git - kernel.git/commitdiff
sfc: modify allocation error message
authorMike Travis <travis@sgi.com>
Tue, 12 May 2009 10:48:36 +0000 (10:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 17 May 2009 18:59:50 +0000 (11:59 -0700)
Change error message when alloc_cpumask_var fails.

Repairs "cpumask: convert drivers/net/sfc".

Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sfc/efx.c

index d3e240b736c73d97ed6241ea6e1b07bc1068e18c..bde8b7ac398a20544ad2f85716125331b9b31bb5 100644 (file)
@@ -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;
        }