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

Pull scheduler fixlets from Thomas Gleixner:
"Three trivial fixlets for the scheduler:

- move print_rt_rq() and print_dl_rq() declarations to the right
place

- make grub_reclaim() static

- fix the bogus documentation reference in Kconfig"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/fair: Fix documentation file path
sched/deadline: Make the grub_reclaim() function static
sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h

+5 -8
+1 -1
init/Kconfig
··· 738 tasks running within the fair group scheduler. Groups with no limit 739 set are considered to be unconstrained and will run with no 740 restriction. 741 - See tip/Documentation/scheduler/sched-bwc.txt for more information. 742 743 config RT_GROUP_SCHED 744 bool "Group scheduling for SCHED_RR/FIFO"
··· 738 tasks running within the fair group scheduler. Groups with no limit 739 set are considered to be unconstrained and will run with no 740 restriction. 741 + See Documentation/scheduler/sched-bwc.txt for more information. 742 743 config RT_GROUP_SCHED 744 bool "Group scheduling for SCHED_RR/FIFO"
+1 -3
kernel/sched/deadline.c
··· 1117 * should be larger than 2^(64 - 20 - 8), which is more than 64 seconds. 1118 * So, overflow is not an issue here. 1119 */ 1120 - u64 grub_reclaim(u64 delta, struct rq *rq, struct sched_dl_entity *dl_se) 1121 { 1122 u64 u_inact = rq->dl.this_bw - rq->dl.running_bw; /* Utot - Uact */ 1123 u64 u_act; ··· 2731 #endif 2732 2733 #ifdef CONFIG_SCHED_DEBUG 2734 - extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq); 2735 - 2736 void print_dl_stats(struct seq_file *m, int cpu) 2737 { 2738 print_dl_rq(m, cpu, &cpu_rq(cpu)->dl);
··· 1117 * should be larger than 2^(64 - 20 - 8), which is more than 64 seconds. 1118 * So, overflow is not an issue here. 1119 */ 1120 + static u64 grub_reclaim(u64 delta, struct rq *rq, struct sched_dl_entity *dl_se) 1121 { 1122 u64 u_inact = rq->dl.this_bw - rq->dl.running_bw; /* Utot - Uact */ 1123 u64 u_act; ··· 2731 #endif 2732 2733 #ifdef CONFIG_SCHED_DEBUG 2734 void print_dl_stats(struct seq_file *m, int cpu) 2735 { 2736 print_dl_rq(m, cpu, &cpu_rq(cpu)->dl);
-2
kernel/sched/rt.c
··· 2701 } 2702 2703 #ifdef CONFIG_SCHED_DEBUG 2704 - extern void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq); 2705 - 2706 void print_rt_stats(struct seq_file *m, int cpu) 2707 { 2708 rt_rq_iter_t iter;
··· 2701 } 2702 2703 #ifdef CONFIG_SCHED_DEBUG 2704 void print_rt_stats(struct seq_file *m, int cpu) 2705 { 2706 rt_rq_iter_t iter;
+3 -2
kernel/sched/sched.h
··· 2025 extern void print_cfs_stats(struct seq_file *m, int cpu); 2026 extern void print_rt_stats(struct seq_file *m, int cpu); 2027 extern void print_dl_stats(struct seq_file *m, int cpu); 2028 - extern void 2029 - print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq); 2030 #ifdef CONFIG_NUMA_BALANCING 2031 extern void 2032 show_numa_stats(struct task_struct *p, struct seq_file *m);
··· 2025 extern void print_cfs_stats(struct seq_file *m, int cpu); 2026 extern void print_rt_stats(struct seq_file *m, int cpu); 2027 extern void print_dl_stats(struct seq_file *m, int cpu); 2028 + extern void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq); 2029 + extern void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq); 2030 + extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq); 2031 #ifdef CONFIG_NUMA_BALANCING 2032 extern void 2033 show_numa_stats(struct task_struct *p, struct seq_file *m);