Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a6f79e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Ingo Molnar:
 "Three small fixlets"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/debug: Fix format string for 32-bit platforms
  sched: Fix warning in kernel/sched/fair.c
  sched/rt: Use root_domain of rt_rq not current processor
parents 51c1abb9 cff3c124

kernel/sched/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) 
			cfs_rq->runnable_load_avg);

	SEQ_printf(m, "  .%-30s: %lld\n", "blocked_load_avg",

			cfs_rq->blocked_load_avg);

	SEQ_printf(m, "  .%-30s: %ld\n", "tg_load_avg",

			atomic64_read(&cfs_rq->tg->load_avg));

	SEQ_printf(m, "  .%-30s: %lld\n", "tg_load_avg",

			(unsigned long long)atomic64_read(&cfs_rq->tg->load_avg));

	SEQ_printf(m, "  .%-30s: %lld\n", "tg_load_contrib",

			cfs_rq->tg_load_contrib);

	SEQ_printf(m, "  .%-30s: %d\n", "tg_runnable_contrib",

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -2663,7 +2663,7 @@ static void destroy_cfs_bandwidth(struct cfs_bandwidth *cfs_b) 
	hrtimer_cancel(&cfs_b->slack_timer);

}



static void unthrottle_offline_cfs_rqs(struct rq *rq)

static void __maybe_unused unthrottle_offline_cfs_rqs(struct rq *rq)

{

	struct cfs_rq *cfs_rq;

kernel/sched/rt.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static inline struct rt_bandwidth *sched_rt_bandwidth(struct rt_rq *rt_rq) 
static int do_balance_runtime(struct rt_rq *rt_rq)

{

	struct rt_bandwidth *rt_b = sched_rt_bandwidth(rt_rq);

	struct root_domain *rd = cpu_rq(smp_processor_id())->rd;

	struct root_domain *rd = rq_of_rt_rq(rt_rq)->rd;

	int i, weight, more = 0;

	u64 rt_period;