Re: [GIT PULL v3] Early boot SLAB for 2.6.31

From: Pekka Enberg
Date: Fri Jun 12 2009 - 04:33:46 EST


On Thu, 2009-06-11 at 15:41 -0700, Yinghai Lu wrote:
> [PATCH] irq: slab alloc for default irq_affinity
>
> Ingo had
>
> [ 0.000000] ------------[ cut here ]------------
> [ 0.000000] WARNING: at mm/bootmem.c:537 alloc_arch_preferred_bootmem+0x2b/0x71()
> [ 0.000000] Hardware name: System Product Name
> [ 0.000000] Modules linked in:
> [ 0.000000] Pid: 0, comm: swapper Tainted: G W 2.6.30-tip-03087-g0bb2618-dirty #52506
> [ 0.000000] Call Trace:
> [ 0.000000] [<81032588>] warn_slowpath_common+0x60/0x90
> [ 0.000000] [<810325c5>] warn_slowpath_null+0xd/0x10
> [ 0.000000] [<819d1bc0>] alloc_arch_preferred_bootmem+0x2b/0x71
> [ 0.000000] [<819d1c31>] ___alloc_bootmem_nopanic+0x2b/0x9a
> [ 0.000000] [<81050a0a>] ? lock_release+0xac/0xb2
> [ 0.000000] [<819d1d4c>] ___alloc_bootmem+0xe/0x2d
> [ 0.000000] [<819d1e9f>] __alloc_bootmem+0xa/0xc
> [ 0.000000] [<819d7c63>] alloc_bootmem_cpumask_var+0x21/0x26
> [ 0.000000] [<819d0cc8>] early_irq_init+0x15/0x10d
> [ 0.000000] [<819bb75a>] start_kernel+0x167/0x326
> [ 0.000000] [<819bb06b>] __init_begin+0x6b/0x70
> [ 0.000000] ---[ end trace 4eaa2a86a8e2da23 ]---
> [ 0.000000] NR_IRQS:2304 nr_irqs:424
> [ 0.000000] CPU 0 irqstacks, hard=821e6000 soft=821e7000
>
> we need to update init_irq_default_affinity
>
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
>
> ---
> kernel/irq/handle.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/kernel/irq/handle.c
> ===================================================================
> --- linux-2.6.orig/kernel/irq/handle.c
> +++ linux-2.6/kernel/irq/handle.c
> @@ -45,7 +45,7 @@ void handle_bad_irq(unsigned int irq, st
> #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
> static void __init init_irq_default_affinity(void)
> {
> - alloc_bootmem_cpumask_var(&irq_default_affinity);
> + alloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT);
> cpumask_setall(irq_default_affinity);
> }
> #else

Applied, thanks!

Pekka

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/