diff options
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 4f26c544d02c..b4f4eb613537 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -1468,7 +1468,7 @@ void fastcall sched_exit(task_t *p) | |||
| 1468 | * the sleep_avg of the parent as well. | 1468 | * the sleep_avg of the parent as well. |
| 1469 | */ | 1469 | */ |
| 1470 | rq = task_rq_lock(p->parent, &flags); | 1470 | rq = task_rq_lock(p->parent, &flags); |
| 1471 | if (p->first_time_slice) { | 1471 | if (p->first_time_slice && task_cpu(p) == task_cpu(p->parent)) { |
| 1472 | p->parent->time_slice += p->time_slice; | 1472 | p->parent->time_slice += p->time_slice; |
| 1473 | if (unlikely(p->parent->time_slice > task_timeslice(p))) | 1473 | if (unlikely(p->parent->time_slice > task_timeslice(p))) |
| 1474 | p->parent->time_slice = task_timeslice(p); | 1474 | p->parent->time_slice = task_timeslice(p); |
| @@ -3877,7 +3877,6 @@ EXPORT_SYMBOL(cpu_present_map); | |||
| 3877 | 3877 | ||
| 3878 | #ifndef CONFIG_SMP | 3878 | #ifndef CONFIG_SMP |
| 3879 | cpumask_t cpu_online_map = CPU_MASK_ALL; | 3879 | cpumask_t cpu_online_map = CPU_MASK_ALL; |
| 3880 | EXPORT_SYMBOL_GPL(cpu_online_map); | ||
| 3881 | cpumask_t cpu_possible_map = CPU_MASK_ALL; | 3880 | cpumask_t cpu_possible_map = CPU_MASK_ALL; |
| 3882 | #endif | 3881 | #endif |
| 3883 | 3882 | ||
