From bd14d5277c8b4ff5f4d2a40ed3697cb42efb2a69 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 2 Nov 2009 20:37:20 +1030 Subject: [PATCH] --- yaml --- r: 168259 b: refs/heads/master c: 49557e620339cb134127b5bfbcfecc06b77d0232 h: refs/heads/master i: 168257: 0c9d1e01f5e31b606e5c4f43343b94f6ba1b55c2 168255: c7a8ffad72edd31cc777ecafa8ee6bcb3bb47e48 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b35454d70d56..3597b1d02498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f685ceacab07d3f6c236f04803e2f2f0dbcc5afb +refs/heads/master: 49557e620339cb134127b5bfbcfecc06b77d0232 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index cae6700bedb3..bf21adb6c9fc 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -9535,13 +9535,13 @@ void __init sched_init(void) current->sched_class = &fair_sched_class; /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ - alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT); + zalloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT); #ifdef CONFIG_SMP #ifdef CONFIG_NO_HZ - alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT); + zalloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT); alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT); #endif - alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); + zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); #endif /* SMP */ perf_event_init();