Re: [PATCH] rcu: don't allocate bootmem from rcu_init

From: Paul E. McKenney
Date: Tue Mar 26 2013 - 12:24:36 EST


On Tue, Mar 26, 2013 at 11:35:16AM -0400, Sasha Levin wrote:
> When rcu_init is called we already have slab working, allocating bootmem
> at that point results in warnings and an allocation from slab.

Good catch, queued for 3.11, thank you!

Thanx, Paul

> Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
> ---
> kernel/rcutree_plugin.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
> index d084ae3..73bac82 100644
> --- a/kernel/rcutree_plugin.h
> +++ b/kernel/rcutree_plugin.h
> @@ -87,7 +87,7 @@ static void __init rcu_bootup_announce_oddness(void)
> #ifdef CONFIG_RCU_NOCB_CPU
> #ifndef CONFIG_RCU_NOCB_CPU_NONE
> if (!have_rcu_nocb_mask) {
> - alloc_bootmem_cpumask_var(&rcu_nocb_mask);
> + alloc_cpumask_var(&rcu_nocb_mask, GFP_KERNEL);
> have_rcu_nocb_mask = true;
> }
> #ifdef CONFIG_RCU_NOCB_CPU_ZERO
> --
> 1.8.1.5
>

--
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/