diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-18 16:42:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-18 16:42:46 +0100 |
| commit | 38b52683569174d95efcb60edfb4985be0e023b5 (patch) | |
| tree | 17fb0c0e66bc8c14ad5c3c416ba76f48ecd0b480 /kernel/sched/sched.h | |
| parent | 14f87cc779ad2ddefe9e1551ac34cd14cb71db21 (diff) | |
| parent | a0e1bccdf9f1c4d68ea024e4254dbbd1eff96a4a (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index ce39224d615..27f51ac8670 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -142,7 +142,7 @@ struct task_group { atomic_t load_weight; atomic64_t load_avg; - atomic_t runnable_avg; + atomic_t runnable_avg, usage_avg; #endif #ifdef CONFIG_RT_GROUP_SCHED @@ -279,7 +279,7 @@ struct cfs_rq { #endif /* CONFIG_FAIR_GROUP_SCHED */ /* These always depend on CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_FAIR_GROUP_SCHED - u32 tg_runnable_contrib; + u32 tg_runnable_contrib, tg_usage_contrib; u64 tg_load_contrib; #endif /* CONFIG_FAIR_GROUP_SCHED */ @@ -464,6 +464,9 @@ struct rq { int active_balance; int push_cpu; struct cpu_stop_work active_balance_work; +#ifdef CONFIG_SCHED_HMP + struct task_struct *migrate_task; +#endif /* cpu of this runqueue: */ int cpu; int online; @@ -642,6 +645,12 @@ static inline unsigned int group_first_cpu(struct sched_group *group) extern int group_balance_cpu(struct sched_group *sg); +#ifdef CONFIG_SCHED_HMP +static LIST_HEAD(hmp_domains); +DECLARE_PER_CPU(struct hmp_domain *, hmp_cpu_domain); +#define hmp_cpu_domain(cpu) (per_cpu(hmp_cpu_domain, (cpu))) +#endif /* CONFIG_SCHED_HMP */ + #endif /* CONFIG_SMP */ #include "stats.h" |