aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/exit.c1
-rw-r--r--kernel/sched.c31
2 files changed, 0 insertions, 32 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 5c8ecbaa19a5..6c7699240327 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -182,7 +182,6 @@ repeat:
182 zap_leader = (leader->exit_signal == -1); 182 zap_leader = (leader->exit_signal == -1);
183 } 183 }
184 184
185 sched_exit(p);
186 write_unlock_irq(&tasklist_lock); 185 write_unlock_irq(&tasklist_lock);
187 proc_flush_task(p); 186 proc_flush_task(p);
188 release_thread(p); 187 release_thread(p);
diff --git a/kernel/sched.c b/kernel/sched.c
index d6624978feb2..7090982350d3 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1831,37 +1831,6 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
1831 task_rq_unlock(this_rq, &flags); 1831 task_rq_unlock(this_rq, &flags);
1832} 1832}
1833 1833
1834/*
1835 * Potentially available exiting-child timeslices are
1836 * retrieved here - this way the parent does not get
1837 * penalized for creating too many threads.
1838 *
1839 * (this cannot be used to 'generate' timeslices
1840 * artificially, because any timeslice recovered here
1841 * was given away by the parent in the first place.)
1842 */
1843void fastcall sched_exit(struct task_struct *p)
1844{
1845 unsigned long flags;
1846 struct rq *rq;
1847
1848 /*
1849 * If the child was a (relative-) CPU hog then decrease
1850 * the sleep_avg of the parent as well.
1851 */
1852 rq = task_rq_lock(p->parent, &flags);
1853 if (p->first_time_slice && task_cpu(p) == task_cpu(p->parent)) {
1854 p->parent->time_slice += p->time_slice;
1855 if (unlikely(p->parent->time_slice > task_timeslice(p)))
1856 p->parent->time_slice = task_timeslice(p);
1857 }
1858 if (p->sleep_avg < p->parent->sleep_avg)
1859 p->parent->sleep_avg = p->parent->sleep_avg /
1860 (EXIT_WEIGHT + 1) * EXIT_WEIGHT + p->sleep_avg /
1861 (EXIT_WEIGHT + 1);
1862 task_rq_unlock(rq, &flags);
1863}
1864
1865/** 1834/**
1866 * prepare_task_switch - prepare to switch tasks 1835 * prepare_task_switch - prepare to switch tasks
1867 * @rq: the runqueue preparing to switch 1836 * @rq: the runqueue preparing to switch