From 1acfc9a5fb0981de7d799a536fd73fcf04bb8cbf Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Tue, 12 May 2009 10:48:36 +0000 Subject: [PATCH] --- yaml --- r: 150209 b: refs/heads/master c: 3977d0334b98770b81dfeb248db232c9bb3d3c88 h: refs/heads/master i: 150207: ea865d37c76032bd253722d88dd87638856e49de v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/efx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9f9417b6ce0b..614839530bc4 100644 --- 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 index d3e240b736c7..bde8b7ac398a 100644 --- 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; }