diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-07 14:36:44 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-07 14:36:44 -0700 |
| commit | 5c0fc54c9b67e04d533b5ebec718d37f747a9170 (patch) | |
| tree | d84f18a4e233beca860dc416445160c847bb83cc /kernel/sched | |
| parent | 18cb0eedcc22a6df7da9e106d0c8741e647e4f87 (diff) | |
| parent | 2cb99ded2f551c78506e5f7bbf6c0d7613351ab1 (diff) | |
Merge tag 'v4.4.20' into android-4.4.y
This is the 4.4.20 stable release
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 5 | ||||
| -rw-r--r-- | kernel/sched/cputime.c | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 6f6c7cc13f33..e6ca9b751b07 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -627,7 +627,10 @@ int get_nohz_timer_target(void) rcu_read_lock(); for_each_domain(cpu, sd) { for_each_cpu(i, sched_domain_span(sd)) { - if (!idle_cpu(i) && is_housekeeping_cpu(cpu)) { + if (cpu == i) + continue; + + if (!idle_cpu(i) && is_housekeeping_cpu(i)) { cpu = i; goto unlock; } diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index f74ea89e77a8..a1aecbedf5b1 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -600,19 +600,25 @@ static void cputime_adjust(struct task_cputime *curr, stime = curr->stime; utime = curr->utime; - if (utime == 0) { - stime = rtime; + /* + * If either stime or both stime and utime are 0, assume all runtime is + * userspace. Once a task gets some ticks, the monotonicy code at + * 'update' will ensure things converge to the observed ratio. + */ + if (stime == 0) { + utime = rtime; goto update; } - if (stime == 0) { - utime = rtime; + if (utime == 0) { + stime = rtime; goto update; } stime = scale_stime((__force u64)stime, (__force u64)rtime, (__force u64)(stime + utime)); +update: /* * Make sure stime doesn't go backwards; this preserves monotonicity * for utime because rtime is monotonic. @@ -635,7 +641,6 @@ static void cputime_adjust(struct task_cputime *curr, stime = rtime - utime; } -update: prev->stime = stime; prev->utime = utime; out: |