]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sched/fair: Move max_cfs_quota_period decl and default_cfs_period() def from fair...
authorTejun Heo <tj@kernel.org>
Sat, 14 Jun 2025 01:23:27 +0000 (15:23 -1000)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 18 Jun 2025 11:59:56 +0000 (13:59 +0200)
max_cfs_quota_period is defined in core.c but has a declaration in fair.c.
Move the declaration to kernel/sched/sched.h. Also, move
default_cfs_period() from fair.c to sched.h. No functional changes.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250614012346.2358261-2-tj@kernel.org
kernel/sched/fair.c
kernel/sched/sched.h

index 6b17d3da034afbdf09708bc9dade896f9b01b912..707be4570430ff6402505f83a924c90318d9a9dc 100644 (file)
@@ -5617,15 +5617,6 @@ void cfs_bandwidth_usage_inc(void) {}
 void cfs_bandwidth_usage_dec(void) {}
 #endif /* !CONFIG_JUMP_LABEL */
 
-/*
- * default period for cfs group bandwidth.
- * default: 0.1s, units: nanoseconds
- */
-static inline u64 default_cfs_period(void)
-{
-       return 100000000ULL;
-}
-
 static inline u64 sched_cfs_bandwidth_slice(void)
 {
        return (u64)sysctl_sched_cfs_bandwidth_slice * NSEC_PER_USEC;
@@ -6405,8 +6396,6 @@ static enum hrtimer_restart sched_cfs_slack_timer(struct hrtimer *timer)
        return HRTIMER_NORESTART;
 }
 
-extern const u64 max_cfs_quota_period;
-
 static enum hrtimer_restart sched_cfs_period_timer(struct hrtimer *timer)
 {
        struct cfs_bandwidth *cfs_b =
index c323d015486cffdeb206b143cf0df28a79c30940..e00b80cd998e9b8b4d83c9cbf4b4ac9f9220130e 100644 (file)
@@ -402,6 +402,19 @@ static inline bool dl_server_active(struct sched_dl_entity *dl_se)
 
 extern struct list_head task_groups;
 
+#ifdef CONFIG_CFS_BANDWIDTH
+extern const u64 max_cfs_quota_period;
+
+/*
+ * default period for cfs group bandwidth.
+ * default: 0.1s, units: nanoseconds
+ */
+static inline u64 default_cfs_period(void)
+{
+       return 100000000ULL;
+}
+#endif /* CONFIG_CFS_BANDWIDTH */
+
 struct cfs_bandwidth {
 #ifdef CONFIG_CFS_BANDWIDTH
        raw_spinlock_t          lock;