git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Sun Jun 17 12:07:34 CEST 2018
   2 From: Mathieu Malaterre <malat@debian.org>
   3 Date: Wed, 16 May 2018 21:53:47 +0200
   4 Subject: sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h
   5
   6 From: Mathieu Malaterre <malat@debian.org>
   7
   8 [ Upstream commit f6a3463063f42d9fb2c78f386437a822e0ad1792 ]
   9
  10 In the following commit:
  11
  12   6b55c9654fcc ("sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h")
  13
  14 the print_cfs_rq() prototype was added to <kernel/sched/sched.h>,
  15 right next to the prototypes for print_cfs_stats(), print_rt_stats()
  16 and print_dl_stats().
  17
  18 Finish this previous commit and also move related prototypes for
  19 print_rt_rq() and print_dl_rq().
  20
  21 Remove existing extern declarations now that they not needed anymore.
  22
  23 Silences the following GCC warning, triggered by W=1:
  24
  25   kernel/sched/debug.c:573:6: warning: no previous prototype for ‘print_rt_rq’ [-Wmissing-prototypes]
  26   kernel/sched/debug.c:603:6: warning: no previous prototype for ‘print_dl_rq’ [-Wmissing-prototypes]
  27
  28 Signed-off-by: Mathieu Malaterre <malat@debian.org>
  29 Acked-by: Peter Zijlstra <peterz@infradead.org>
  30 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  31 Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
  32 Cc: Thomas Gleixner <tglx@linutronix.de>
  33 Link: http://lkml.kernel.org/r/20180516195348.30426-1-malat@debian.org
  34 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  35 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  36 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  37 ---
  38  kernel/sched/deadline.c |    2 --
  39  kernel/sched/rt.c       |    2 --
  40  kernel/sched/sched.h    |    5 +++--
  41  3 files changed, 3 insertions(+), 6 deletions(-)
  42
  43 --- a/kernel/sched/deadline.c
  44 +++ b/kernel/sched/deadline.c
  45 @@ -2723,8 +2723,6 @@ bool dl_cpu_busy(unsigned int cpu)
  46  #endif
  47
  48  #ifdef CONFIG_SCHED_DEBUG
  49 -extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq);
  50 -
  51  void print_dl_stats(struct seq_file *m, int cpu)
  52  {
  53         print_dl_rq(m, cpu, &cpu_rq(cpu)->dl);
  54 --- a/kernel/sched/rt.c
  55 +++ b/kernel/sched/rt.c
  56 @@ -2691,8 +2691,6 @@ int sched_rr_handler(struct ctl_table *t
  57  }
  58
  59  #ifdef CONFIG_SCHED_DEBUG
  60 -extern void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq);
  61 -
  62  void print_rt_stats(struct seq_file *m, int cpu)
  63  {
  64         rt_rq_iter_t iter;
  65 --- a/kernel/sched/sched.h
  66 +++ b/kernel/sched/sched.h
  67 @@ -1986,8 +1986,9 @@ extern bool sched_debug_enabled;
  68  extern void print_cfs_stats(struct seq_file *m, int cpu);
  69  extern void print_rt_stats(struct seq_file *m, int cpu);
  70  extern void print_dl_stats(struct seq_file *m, int cpu);
  71 -extern void
  72 -print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq);
  73 +extern void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq);
  74 +extern void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq);
  75 +extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq);
  76  #ifdef CONFIG_NUMA_BALANCING
  77  extern void
  78  show_numa_stats(struct task_struct *p, struct seq_file *m);