From 597720953e3b1ccfcfcb0b0565c63cab5503b2fd Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 11 Jun 2009 08:35:27 +0300 Subject: [PATCH] --- yaml --- r: 147122 b: refs/heads/master c: 4bdddf8ff9bbb8aa7b4d7847586202bd25842c90 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 550782dc0c69..35a07d5a9635 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 959982fee4e635c61780e989c3e34267143fcc02 +refs/heads/master: 4bdddf8ff9bbb8aa7b4d7847586202bd25842c90 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index a9ff9533355b..12cc09cf5147 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -9310,13 +9310,13 @@ void __init sched_init(void) current->sched_class = &fair_sched_class; /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ - alloc_bootmem_cpumask_var(&nohz_cpu_mask); + alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT); #ifdef CONFIG_SMP #ifdef CONFIG_NO_HZ - alloc_bootmem_cpumask_var(&nohz.cpu_mask); - alloc_bootmem_cpumask_var(&nohz.ilb_grp_nohz_mask); + alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT); + alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT); #endif - alloc_bootmem_cpumask_var(&cpu_isolated_map); + alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); #endif /* SMP */ scheduler_running = 1;