aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 3a4ac0b75f2d..21cc3b2be023 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -180,7 +180,6 @@ struct cfs_rq {
180 u64 exec_clock; 180 u64 exec_clock;
181 u64 min_vruntime; 181 u64 min_vruntime;
182 s64 wait_runtime; 182 s64 wait_runtime;
183 u64 sleeper_bonus;
184 unsigned long wait_runtime_overruns, wait_runtime_underruns; 183 unsigned long wait_runtime_overruns, wait_runtime_underruns;
185 184
186 struct rb_root tasks_timeline; 185 struct rb_root tasks_timeline;
@@ -673,19 +672,6 @@ static inline void resched_task(struct task_struct *p)
673} 672}
674#endif 673#endif
675 674
676static u64 div64_likely32(u64 divident, unsigned long divisor)
677{
678#if BITS_PER_LONG == 32
679 if (likely(divident <= 0xffffffffULL))
680 return (u32)divident / divisor;
681 do_div(divident, divisor);
682
683 return divident;
684#else
685 return divident / divisor;
686#endif
687}
688
689#if BITS_PER_LONG == 32 675#if BITS_PER_LONG == 32
690# define WMULT_CONST (~0UL) 676# define WMULT_CONST (~0UL)
691#else 677#else
@@ -1016,8 +1002,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
1016 1002
1017 if (p->se.wait_start_fair) 1003 if (p->se.wait_start_fair)
1018 p->se.wait_start_fair -= fair_clock_offset; 1004 p->se.wait_start_fair -= fair_clock_offset;
1019 if (p->se.sleep_start_fair)
1020 p->se.sleep_start_fair -= fair_clock_offset;
1021 1005
1022#ifdef CONFIG_SCHEDSTATS 1006#ifdef CONFIG_SCHEDSTATS
1023 if (p->se.wait_start) 1007 if (p->se.wait_start)
@@ -1592,7 +1576,6 @@ static void __sched_fork(struct task_struct *p)
1592 p->se.sum_exec_runtime = 0; 1576 p->se.sum_exec_runtime = 0;
1593 p->se.prev_sum_exec_runtime = 0; 1577 p->se.prev_sum_exec_runtime = 0;
1594 p->se.wait_runtime = 0; 1578 p->se.wait_runtime = 0;
1595 p->se.sleep_start_fair = 0;
1596 1579
1597#ifdef CONFIG_SCHEDSTATS 1580#ifdef CONFIG_SCHEDSTATS
1598 p->se.wait_start = 0; 1581 p->se.wait_start = 0;
@@ -6582,7 +6565,6 @@ void normalize_rt_tasks(void)
6582 p->se.wait_runtime = 0; 6565 p->se.wait_runtime = 0;
6583 p->se.exec_start = 0; 6566 p->se.exec_start = 0;
6584 p->se.wait_start_fair = 0; 6567 p->se.wait_start_fair = 0;
6585 p->se.sleep_start_fair = 0;
6586#ifdef CONFIG_SCHEDSTATS 6568#ifdef CONFIG_SCHEDSTATS
6587 p->se.wait_start = 0; 6569 p->se.wait_start = 0;
6588 p->se.sleep_start = 0; 6570 p->se.sleep_start = 0;