| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Mathieu Malaterre <malat@debian.org> |
| Date: Wed, 16 May 2018 21:53:47 +0200 |
| Subject: sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h |
| |
| From: Mathieu Malaterre <malat@debian.org> |
| |
| [ Upstream commit f6a3463063f42d9fb2c78f386437a822e0ad1792 ] |
| |
| In the following commit: |
| |
| 6b55c9654fcc ("sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h") |
| |
| the print_cfs_rq() prototype was added to <kernel/sched/sched.h>, |
| right next to the prototypes for print_cfs_stats(), print_rt_stats() |
| and print_dl_stats(). |
| |
| Finish this previous commit and also move related prototypes for |
| print_rt_rq() and print_dl_rq(). |
| |
| Remove existing extern declarations now that they not needed anymore. |
| |
| Silences the following GCC warning, triggered by W=1: |
| |
| kernel/sched/debug.c:573:6: warning: no previous prototype for ‘print_rt_rq’ [-Wmissing-prototypes] |
| kernel/sched/debug.c:603:6: warning: no previous prototype for ‘print_dl_rq’ [-Wmissing-prototypes] |
| |
| Signed-off-by: Mathieu Malaterre <malat@debian.org> |
| Acked-by: Peter Zijlstra <peterz@infradead.org> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Link: http://lkml.kernel.org/r/20180516195348.30426-1-malat@debian.org |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| kernel/sched/deadline.c | 2 -- |
| kernel/sched/rt.c | 2 -- |
| kernel/sched/sched.h | 5 +++-- |
| 3 files changed, 3 insertions(+), 6 deletions(-) |
| |
| --- a/kernel/sched/deadline.c |
| +++ b/kernel/sched/deadline.c |
| @@ -2723,8 +2723,6 @@ bool dl_cpu_busy(unsigned int cpu) |
| #endif |
| |
| #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); |
| --- a/kernel/sched/rt.c |
| +++ b/kernel/sched/rt.c |
| @@ -2691,8 +2691,6 @@ int sched_rr_handler(struct ctl_table *t |
| } |
| |
| #ifdef CONFIG_SCHED_DEBUG |
| -extern void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq); |
| - |
| void print_rt_stats(struct seq_file *m, int cpu) |
| { |
| rt_rq_iter_t iter; |
| --- a/kernel/sched/sched.h |
| +++ b/kernel/sched/sched.h |
| @@ -1986,8 +1986,9 @@ extern bool sched_debug_enabled; |
| extern void print_cfs_stats(struct seq_file *m, int cpu); |
| extern void print_rt_stats(struct seq_file *m, int cpu); |
| extern void print_dl_stats(struct seq_file *m, int cpu); |
| -extern void |
| -print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq); |
| +extern void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq); |
| +extern void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq); |
| +extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq); |
| #ifdef CONFIG_NUMA_BALANCING |
| extern void |
| show_numa_stats(struct task_struct *p, struct seq_file *m); |