From: Alex Shi <alex.shi@linaro.org>
Date: Sun, 22 Dec 2013 03:12:04 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~158^2~18
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3c6556b1a9c2f9c91aacbc57bac938691fedda81;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
---

3c6556b1a9c2f9c91aacbc57bac938691fedda81
diff --cc kernel/sched/debug.c
index 6b7b86cfabad,e745a1548367..c2665cd29594
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@@ -224,9 -223,15 +224,17 @@@ void print_cfs_rq(struct seq_file *m, i
  			cfs_rq->tg_runnable_contrib);
  	SEQ_printf(m, "  .%-30s: %d\n", "tg->runnable_avg",
  			atomic_read(&cfs_rq->tg->runnable_avg));
 +	SEQ_printf(m, "  .%-30s: %d\n", "tg->usage_avg",
 +			atomic_read(&cfs_rq->tg->usage_avg));
  #endif
+ #ifdef CONFIG_CFS_BANDWIDTH
+ 	SEQ_printf(m, "  .%-30s: %d\n", "tg->cfs_bandwidth.timer_active",
+ 			cfs_rq->tg->cfs_bandwidth.timer_active);
+ 	SEQ_printf(m, "  .%-30s: %d\n", "throttled",
+ 			cfs_rq->throttled);
+ 	SEQ_printf(m, "  .%-30s: %d\n", "throttle_count",
+ 			cfs_rq->throttle_count);
+ #endif
  
  	print_cfs_group_stats(m, cpu, cfs_rq->tg);
  #endif