From b7fe563ecb164353260eba7764334cb22281be06 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 11 Jun 2009 08:41:22 +0300 Subject: [PATCH] --- yaml --- r: 147123 b: refs/heads/master c: 0fb530291621c8b8a1b16abeeab05d9262489f71 h: refs/heads/master i: 147121: 586c836e1920c86c3fbac12b0f9e0ca32e8d01a8 147119: 7c290f6b11f6abd3a06e89d2b1880e7b584f0a78 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 2 +- trunk/kernel/sched_cpupri.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 35a07d5a9635..ab80d7614edd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bdddf8ff9bbb8aa7b4d7847586202bd25842c90 +refs/heads/master: 0fb530291621c8b8a1b16abeeab05d9262489f71 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 12cc09cf5147..dcf2dc28931a 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -7795,7 +7795,7 @@ static int __init_refok init_rootdomain(struct root_domain *rd, bool bootmem) if (!alloc_cpumask_var(&rd->rto_mask, gfp)) goto free_online; - if (cpupri_init(&rd->cpupri, false) != 0) + if (cpupri_init(&rd->cpupri, bootmem) != 0) goto free_rto_mask; return 0; diff --git a/trunk/kernel/sched_cpupri.c b/trunk/kernel/sched_cpupri.c index 344712a5e3ed..7deffc9f0e5f 100644 --- a/trunk/kernel/sched_cpupri.c +++ b/trunk/kernel/sched_cpupri.c @@ -154,8 +154,12 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri) */ int __init_refok cpupri_init(struct cpupri *cp, bool bootmem) { + gfp_t gfp = GFP_KERNEL; int i; + if (bootmem) + gfp = GFP_NOWAIT; + memset(cp, 0, sizeof(*cp)); for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) { @@ -163,9 +167,7 @@ int __init_refok cpupri_init(struct cpupri *cp, bool bootmem) spin_lock_init(&vec->lock); vec->count = 0; - if (bootmem) - alloc_bootmem_cpumask_var(&vec->mask); - else if (!zalloc_cpumask_var(&vec->mask, GFP_KERNEL)) + if (!zalloc_cpumask_var(&vec->mask, gfp)) goto cleanup; }