diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-16 04:29:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-16 04:29:07 -0800 |
| commit | 1e5081e1b29bfbd508533677454a3c2f7cc63702 (patch) | |
| tree | 3c910328ca3963e99889629d08bbdd562d0517a8 | |
| parent | 9f0ae8e606e430eafe6652f6024a7856ac77b294 (diff) | |
| parent | 68b55fe985df8e03739a5dfe72dd3ce1903c5703 (diff) | |
Merge "sched: Initialize variables"
| -rw-r--r-- | kernel/sched/core.c | 4 | ||||
| -rw-r--r-- | kernel/sched/hmp.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b70a76058b00..76cbd55e99ac 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5859,7 +5859,7 @@ int sched_isolate_cpu(int cpu) struct rq *rq = cpu_rq(cpu); cpumask_t avail_cpus; int ret_code = 0; - u64 start_time; + u64 start_time = 0; if (trace_sched_isolate_enabled()) start_time = sched_clock(); @@ -5929,7 +5929,7 @@ int sched_unisolate_cpu_unlocked(int cpu) { int ret_code = 0; struct rq *rq = cpu_rq(cpu); - u64 start_time; + u64 start_time = 0; if (trace_sched_isolate_enabled()) start_time = sched_clock(); diff --git a/kernel/sched/hmp.c b/kernel/sched/hmp.c index 15b8f2c80e06..443f16732414 100644 --- a/kernel/sched/hmp.c +++ b/kernel/sched/hmp.c @@ -2309,7 +2309,7 @@ static void update_cpu_busy_time(struct task_struct *p, struct rq *rq, bool new_task; struct related_thread_group *grp; int cpu = rq->cpu; - u32 old_curr_window; + u32 old_curr_window = p->ravg.curr_window; new_window = mark_start < window_start; if (new_window) { @@ -2370,8 +2370,6 @@ static void update_cpu_busy_time(struct task_struct *p, struct rq *rq, * task or exiting tasks. */ if (!is_idle_task(p) && !exiting_task(p)) { - old_curr_window = p->ravg.curr_window; - if (new_window) rollover_task_window(p, full_window); } |