diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /kernel/sched_rt.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 833b6d44483c..954e1a81b796 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -1383,7 +1383,8 @@ static inline void init_sched_rt_class(void) | |||
| 1383 | unsigned int i; | 1383 | unsigned int i; |
| 1384 | 1384 | ||
| 1385 | for_each_possible_cpu(i) | 1385 | for_each_possible_cpu(i) |
| 1386 | alloc_cpumask_var(&per_cpu(local_cpu_mask, i), GFP_KERNEL); | 1386 | alloc_cpumask_var_node(&per_cpu(local_cpu_mask, i), |
| 1387 | GFP_KERNEL, cpu_to_node(i)); | ||
| 1387 | } | 1388 | } |
| 1388 | #endif /* CONFIG_SMP */ | 1389 | #endif /* CONFIG_SMP */ |
| 1389 | 1390 | ||