Skip to contentSkip to conversation

sched/debug: Move print_rt_rq and print_dl_rq declarations to kernel/sched/sched.h

PATCH New Mathieu Malaterre 2 participants 2 messages May 16, 2018 – May 18, 2018 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched/debug: Move print_rt_rq and print_dl_rq declarations to kernel/sched/sched.h

In commit 6b55c9654fcc ("sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h"), ‘print_cfs_rq’ prototype was added to <kernel/sched/sched.h> right next to prototypes for ‘print_cfs_stats’, ‘print_rt_stats’ and ‘print_dl_stats’. Update this previous commit and also move related prototypes: ‘print_rt_rq’ and ‘print_dl_rq’. Remove existing extern declarations now that they not needed anymore.

Silence the following gcc warning, triggered at 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]

---
 kernel/sched/deadline.c | 2 --
 kernel/sched/rt.c       | 2 --
 kernel/sched/sched.h    | 5 +++--
 3 files changed, 3 insertions(+), 6 deletions(-)
kernel/sched/deadline.c +0 -2
index 125703d9b25e..1356afd1eeb6 100644
@@ -2731,8 +2731,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);
kernel/sched/rt.c +0 -2
index 7aef6b4e885a..ef3c4e6f5345 100644
@@ -2701,8 +2701,6 @@ int sched_rr_handler(struct ctl_table *table, int write,
 }
 
 #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;
kernel/sched/sched.h +3 -2
index 15750c222ca2..1f0a4bc6a39d 100644
@@ -2025,8 +2025,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);
Signature · 1 line
2.11.0
#1 lore raw

[tip:sched/urgent] sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h

sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h
Commit-ID:  f6a3463063f42d9fb2c78f386437a822e0ad1792
Gitweb:     https://git.kernel.org/tip/f6a3463063f42d9fb2c78f386437a822e0ad1792
Author:     Mathieu Malaterre <[email protected]>
AuthorDate: Wed, 16 May 2018 21:53:47 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 18 May 2018 09:05:14 +0200

sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h

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]

---
 kernel/sched/deadline.c | 2 --
 kernel/sched/rt.c       | 2 --
 kernel/sched/sched.h    | 5 +++--
 3 files changed, 3 insertions(+), 6 deletions(-)
kernel/sched/deadline.c +0 -2
index e7b3008b85bb..d6196bc6cbb5 100644
@@ -2731,8 +2731,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);
kernel/sched/rt.c +0 -2
index 7aef6b4e885a..ef3c4e6f5345 100644
@@ -2701,8 +2701,6 @@ int sched_rr_handler(struct ctl_table *table, int write,
 }
 
 #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;
kernel/sched/sched.h +3 -2
index 15750c222ca2..1f0a4bc6a39d 100644
@@ -2025,8 +2025,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);