diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-09 19:48:32 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-09 19:48:32 +0400 |
| commit | 13df635f080d411a152c92087a384135c1562fac (patch) | |
| tree | 71330df816c147e2c11dc68dfbd39a0c296cb163 /kernel/sched_rt.c | |
| parent | 9cdba30283ecad22970e954c5595c9079d7a7f63 (diff) | |
| parent | 8437a617708d014d6f220df201a24960e00d57b1 (diff) | |
| download | linux-13df635f080d411a152c92087a384135c1562fac.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
kvm: fix kvm reboot crash when MAXSMP is used
cpumask: alloc zeroed cpumask for static cpumask_var_ts
cpumask: introduce zalloc_cpumask_var
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index f2c66f8f9712..9bf0d2a73045 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c @@ -1591,7 +1591,7 @@ static inline void init_sched_rt_class(void) unsigned int i; for_each_possible_cpu(i) - alloc_cpumask_var_node(&per_cpu(local_cpu_mask, i), + zalloc_cpumask_var_node(&per_cpu(local_cpu_mask, i), GFP_KERNEL, cpu_to_node(i)); } #endif /* CONFIG_SMP */ |