diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-18 03:25:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-18 03:25:03 -0700 |
| commit | 0efa66ae3e007d1be08ed3198652863824e81375 (patch) | |
| tree | da1e9ec819378715cf3757b34f3a58288f9ace3e /kernel | |
| parent | a8cbf3d8be46c849b0c4997b698dd64d782ce218 (diff) | |
| parent | 34418fc16ee38e61cd135717b464d9e792925ea0 (diff) | |
Merge "sched/fair: Fix issue with trace flag not being set properly"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6362b864e2b1..98ae45174a40 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3189,8 +3189,8 @@ retry: } } p->last_cpu_selected_ts = sched_ktime_clock(); - sbc_flag |= env.sbc_best_cluster_flag; out: + sbc_flag |= env.sbc_best_cluster_flag; rcu_read_unlock(); trace_sched_task_load(p, sched_boost(), env.reason, env.sync, env.need_idle, sbc_flag, target); |