From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 16 Nov 2014 09:50:25 +0000 (+0100)
Subject: Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying more... 
X-Git-Tag: v3.19-rc1~158^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec;p=karo-tx-linux.git

Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying more changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec
diff --cc kernel/sched/deadline.c
index f3d7776656ee,28fa9d9e9201..b0911797422f
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@@ -1747,13 -1701,6 +1747,15 @@@ const struct sched_class dl_sched_clas
  	.prio_changed           = prio_changed_dl,
  	.switched_from		= switched_from_dl,
  	.switched_to		= switched_to_dl,
+ 
+ 	.update_curr		= update_curr_dl,
  };
 +
 +#ifdef CONFIG_SCHED_DEBUG
 +extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq);
 +
 +void print_dl_stats(struct seq_file *m, int cpu)
 +{
 +	print_dl_rq(m, cpu, &cpu_rq(cpu)->dl);
 +}
 +#endif /* CONFIG_SCHED_DEBUG */