From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 1/2] sfc: modify allocation error message Date: Wed, 11 Feb 2009 13:27:34 -0800 Message-ID: <200902112127.n1BLRZSA031950@imap1.linux-foundation.org> Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, travis@sgi.com, bhutchings@solarflare.com To: davem@davemloft.net Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:37127 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758693AbZBKV20 (ORCPT ); Wed, 11 Feb 2009 16:28:26 -0500 Sender: netdev-owner@vger.kernel.org List-ID: From: Mike Travis Change error message when alloc_cpumask_var fails. Signed-off-by: Mike Travis Acked-by: Ben Hutchings Signed-off-by: Andrew Morton --- drivers/net/sfc/efx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/net/sfc/efx.c~sfc-modify-allocation-error-message drivers/net/sfc/efx.c --- a/drivers/net/sfc/efx.c~sfc-modify-allocation-error-message +++ a/drivers/net/sfc/efx.c @@ -857,9 +857,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; } _