* [patch 1/2] sfc: modify allocation error message
@ 2009-05-12 20:48 akpm
2009-05-17 20:59 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: akpm @ 2009-05-12 20:48 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, travis, bhutchings, mingo, rusty
From: Mike Travis <travis@sgi.com>
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>
---
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
@@ -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;
}
_
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 1/2] sfc: modify allocation error message
2009-05-12 20:48 [patch 1/2] sfc: modify allocation error message akpm
@ 2009-05-17 20:59 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2009-05-17 20:59 UTC (permalink / raw)
To: akpm; +Cc: netdev, travis, bhutchings, mingo, rusty
From: akpm@linux-foundation.org
Date: Tue, 12 May 2009 13:48:36 -0700
> From: Mike Travis <travis@sgi.com>
>
> 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>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 1/2] sfc: modify allocation error message
2009-02-11 21:27 akpm
@ 2009-02-13 0:45 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2009-02-13 0:45 UTC (permalink / raw)
To: akpm; +Cc: netdev, travis, bhutchings
From: akpm@linux-foundation.org
Date: Wed, 11 Feb 2009 13:27:34 -0800
> Change error message when alloc_cpumask_var fails.
>
> Signed-off-by: Mike Travis <travis@sgi.com>
> Acked-by: Ben Hutchings <bhutchings@solarflare.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This has to go into whatever tree adds the alloc_cpumask_var()
call to this function, and that isn't one of the networking
trees. :-)
Anyways, for the record I'm fine with this change:
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [patch 1/2] sfc: modify allocation error message
@ 2009-02-11 21:27 akpm
2009-02-13 0:45 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: akpm @ 2009-02-11 21:27 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, travis, bhutchings
From: Mike Travis <travis@sgi.com>
Change error message when alloc_cpumask_var fails.
Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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;
}
_
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-05-17 20:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-12 20:48 [patch 1/2] sfc: modify allocation error message akpm
2009-05-17 20:59 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2009-02-11 21:27 akpm
2009-02-13 0:45 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.