[<prev] [next>] [day] [month] [year] [list]
Message-ID: <164733306423.16921.13170771691611393113.tip-bot2@tip-bot2>
Date: Tue, 15 Mar 2022 08:31:04 -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: Add header guard to
kernel/sched/stats.h and kernel/sched/autogroup.h
The following commit has been merged into the sched/core branch of tip:
Commit-ID: d90a2f160a1cd9a1745896c381afdf8d2812fd6b
Gitweb: https://git.kernel.org/tip/d90a2f160a1cd9a1745896c381afdf8d2812fd6b
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Sat, 20 Nov 2021 10:39:20 +01:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Wed, 23 Feb 2022 08:22:00 +01:00
sched/headers: Add header guard to kernel/sched/stats.h and kernel/sched/autogroup.h
Protect against multiple inclusion.
Also include "sched.h" in "stat.h", as it relies on it.
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Reviewed-by: Peter Zijlstra <peterz@...radead.org>
---
kernel/sched/autogroup.h | 5 +++++
kernel/sched/stats.h | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/kernel/sched/autogroup.h b/kernel/sched/autogroup.h
index 90fcbfd..90d69f2 100644
--- a/kernel/sched/autogroup.h
+++ b/kernel/sched/autogroup.h
@@ -1,4 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _KERNEL_SCHED_AUTOGROUP_H
+#define _KERNEL_SCHED_AUTOGROUP_H
+
#ifdef CONFIG_SCHED_AUTOGROUP
struct autogroup {
@@ -59,3 +62,5 @@ static inline int autogroup_path(struct task_group *tg, char *buf, int buflen)
}
#endif /* CONFIG_SCHED_AUTOGROUP */
+
+#endif /* _KERNEL_SCHED_AUTOGROUP_H */
diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h
index 3a3c826..edc0d13 100644
--- a/kernel/sched/stats.h
+++ b/kernel/sched/stats.h
@@ -1,7 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _KERNEL_STATS_H
+#define _KERNEL_STATS_H
#ifdef CONFIG_SCHEDSTATS
+#include "sched.h"
+
extern struct static_key_false sched_schedstats;
/*
@@ -298,3 +302,5 @@ sched_info_switch(struct rq *rq, struct task_struct *prev, struct task_struct *n
# define sched_info_dequeue(rq, t) do { } while (0)
# define sched_info_switch(rq, t, next) do { } while (0)
#endif /* CONFIG_SCHED_INFO */
+
+#endif /* _KERNEL_STATS_H */
Powered by blists - more mailing lists