sfc: modify allocation error message
Subsystems (2)
PATCH 1/2 sfc: modify allocation error message
From: Mike Travis <[email protected]>
Change error message when alloc_cpumask_var fails.
Repairs "cpumask: convert drivers/net/sfc".
Signed-off-by Mike Travis <[email protected]>
Acked-by Ben Hutchings <[email protected]>
Acked-by David S. Miller <[email protected]>
Cc Rusty Russell <[email protected]>
Cc Ingo Molnar <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/sfc/efx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/sfc/efx.c renamed from drivers/net/sfc/efx.c~sfc-modify-allocation-error-message +2 -2
@@ -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 ; }
_
From: [email protected]
Date: Tue, 12 May 2009 13:48:36 -0700
Quoted 4 lines
From: Mike Travis <[email protected]>
Change error message when
alloc_cpumask_varfails.
Quoted 8 lines
Repairs "cpumask: convert
drivers/net/sfc".Signed-off-by Mike Travis <[email protected]>Acked-by Ben Hutchings <[email protected]>Acked-by David S. Miller <[email protected]>Cc Rusty Russell <[email protected]>Cc Ingo Molnar <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Applied to net-next-2.6