[<prev] [next>] [day] [month] [year] [list]
Message-ID: <164733305721.16921.17375336826369599412.tip-bot2@tip-bot2>
Date: Tue, 15 Mar 2022 08:30:57 -0000
From: "tip-bot2 for Ingo Molnar" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Ingo Molnar <mingo@...nel.org>,
Peter Zijlstra <peterz@...radead.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: sched/core] sched/headers: Standardize kernel/sched/sched.h
header dependencies
The following commit has been merged into the sched/core branch of tip:
Commit-ID: b9e9c6ca6e54b5d58a57663f76c5cb33c12ea98f
Gitweb: https://git.kernel.org/tip/b9e9c6ca6e54b5d58a57663f76c5cb33c12ea98f
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Sun, 13 Feb 2022 08:19:43 +01:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Wed, 23 Feb 2022 10:58:33 +01:00
sched/headers: Standardize kernel/sched/sched.h header dependencies
kernel/sched/sched.h is a weird mix of ad-hoc headers included
in the middle of the header.
Two of them rely on being included in the middle of kernel/sched/sched.h,
due to definitions they require:
- "stat.h" needs the rq definitions.
- "autogroup.h" needs the task_group definition.
Move the inclusion of these two files out of kernel/sched/sched.h, and
include them in all files that require them.
Move of the rest of the header dependencies to the top of the
kernel/sched/sched.h file.
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Reviewed-by: Peter Zijlstra <peterz@...radead.org>
---
kernel/sched/build_policy.c | 3 +++
kernel/sched/build_utility.c | 2 ++
kernel/sched/core.c | 2 ++
kernel/sched/fair.c | 2 ++
kernel/sched/sched.h | 20 +++++++++++---------
kernel/sched/stats.h | 4 ++--
6 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/kernel/sched/build_policy.c b/kernel/sched/build_policy.c
index 6bb384d..9a169b2 100644
--- a/kernel/sched/build_policy.c
+++ b/kernel/sched/build_policy.c
@@ -13,6 +13,9 @@
*/
#include "sched.h"
+
+#include "autogroup.h"
+#include "stats.h"
#include "pelt.h"
#include "idle.c"
diff --git a/kernel/sched/build_utility.c b/kernel/sched/build_utility.c
index 31216ce..8b2b199 100644
--- a/kernel/sched/build_utility.c
+++ b/kernel/sched/build_utility.c
@@ -12,6 +12,8 @@
#include "sched.h"
#include "sched-pelt.h"
+#include "stats.h"
+#include "autogroup.h"
#include <linux/sched_clock.h>
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ef94612..22de537 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -11,6 +11,8 @@
#undef CREATE_TRACE_POINTS
#include "sched.h"
+#include "stats.h"
+#include "autogroup.h"
#include <linux/nospec.h>
#include <linux/blkdev.h>
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 16874e1..7391c92 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -21,6 +21,8 @@
* Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra
*/
#include "sched.h"
+#include "stats.h"
+#include "autogroup.h"
/*
* Targeted preemption latency for CPU-bound tasks:
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index f7d10b9..f255ec2 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -96,11 +96,20 @@
# include <asm/paravirt.h>
#endif
+#include <trace/events/sched.h>
+
+#ifdef CONFIG_CGROUP_SCHED
+#include <linux/cgroup.h>
+#include <linux/psi.h>
+#endif
+
+#ifdef CONFIG_SCHED_DEBUG
+# include <linux/static_key.h>
+#endif
+
#include "cpupri.h"
#include "cpudeadline.h"
-#include <trace/events/sched.h>
-
#ifdef CONFIG_SCHED_DEBUG
# define SCHED_WARN_ON(x) WARN_ONCE(x, #x)
#else
@@ -417,9 +426,6 @@ extern bool dl_cpu_busy(unsigned int cpu);
#ifdef CONFIG_CGROUP_SCHED
-#include <linux/cgroup.h>
-#include <linux/psi.h>
-
struct cfs_rq;
struct rt_rq;
@@ -1919,9 +1925,6 @@ extern void flush_smp_call_function_from_idle(void);
static inline void flush_smp_call_function_from_idle(void) { }
#endif
-#include "stats.h"
-#include "autogroup.h"
-
#if defined(CONFIG_SCHED_CORE) && defined(CONFIG_SCHEDSTATS)
extern void __sched_core_account_forceidle(struct rq *rq);
@@ -2016,7 +2019,6 @@ static inline void __set_task_cpu(struct task_struct *p, unsigned int cpu)
* Tunables that become constants when CONFIG_SCHED_DEBUG is off:
*/
#ifdef CONFIG_SCHED_DEBUG
-# include <linux/static_key.h>
# define const_debug __read_mostly
#else
# define const_debug const
diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h
index edc0d13..a0df79e 100644
--- a/kernel/sched/stats.h
+++ b/kernel/sched/stats.h
@@ -2,10 +2,10 @@
#ifndef _KERNEL_STATS_H
#define _KERNEL_STATS_H
-#ifdef CONFIG_SCHEDSTATS
-
#include "sched.h"
+#ifdef CONFIG_SCHEDSTATS
+
extern struct static_key_false sched_schedstats;
/*
Powered by blists - more mailing lists