shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Browse Source
This commit is contained in:
Alex Shi
2013-12-19 13:51:33 +08:00
parent 4a95902818 b8420132aa
commit 188c91c2f4
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/sched/debug.c
View File

@@ -569,6 +569,12 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
"nr_involuntary_switches", (long long)p->nivcsw);
P(se.load.weight);
#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)
P(se.avg.runnable_avg_sum);
P(se.avg.runnable_avg_period);
P(se.avg.load_avg_contrib);
P(se.avg.decay_count);
#endif
P(policy);
P(prio);
#undef PN

8
kernel/sched/fair.c
View File

@@ -1714,7 +1714,13 @@ static inline void enqueue_entity_load_avg(struct cfs_rq *cfs_rq,
}
wakeup = 0;
} else {
__synchronize_entity_decay(se);
/*
* Task re-woke on same cpu (or else migrate_task_rq_fair()
* would have made count negative); we must be careful to avoid
* double-accounting blocked time after synchronizing decays.
*/
se->avg.last_runnable_update += __synchronize_entity_decay(se)
<< 20;
}
/* migrated tasks did not contribute to our blocked load */