Skip to contentSkip to conversation

sched: make sched_group_{get,set}_rt_{runtime,period} functions static

PATCH In review Michel Lespinasse 2 participants 2 messages Mar 8, 2013 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched: make sched_group_{get,set}_rt_{runtime,period} functions static

Just a tiny cleanup I did while I was looking through scheduler code doing a tasklist_lock change. Please consider applying if you find it appropriate.

------------------------------8<-----------------------------------------
sched: make sched_group_{get,set}_rt_{runtime,period} functions static

These functions, as well as sched_rt_can_attach(), used to be public so that kernel/user.c could use them; however this use has now disappeared so that these functions can be made static again.

---
 include/linux/sched.h |  9 ---------
 kernel/sched/core.c   | 11 ++++++-----
 2 files changed, 6 insertions(+), 14 deletions(-)
include/linux/sched.h +0 -9
index d35d2b6ddbfb..ac8dbca5ea15 100644
@@ -2694,15 +2694,6 @@ extern void sched_move_task(struct task_struct *tsk);
 extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);
 extern unsigned long sched_group_shares(struct task_group *tg);
 #endif
-#ifdef CONFIG_RT_GROUP_SCHED
-extern int sched_group_set_rt_runtime(struct task_group *tg,
-				      long rt_runtime_us);
-extern long sched_group_rt_runtime(struct task_group *tg);
-extern int sched_group_set_rt_period(struct task_group *tg,
-				      long rt_period_us);
-extern long sched_group_rt_period(struct task_group *tg);
-extern int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk);
-#endif
 #endif /* CONFIG_CGROUP_SCHED */
 
 extern int task_can_switch_user(struct user_struct *up,
kernel/sched/core.c +6 -5
index 7f12624a393c..4c0b8c333034 100644
@@ -7455,7 +7455,8 @@ unlock:
 	return err;
 }
 
-int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us)
+static int
+sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us)
 {
 	u64 rt_runtime, rt_period;
 
@@ -7467,7 +7468,7 @@ int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us)
 	return tg_set_rt_bandwidth(tg, rt_period, rt_runtime);
 }
 
-long sched_group_rt_runtime(struct task_group *tg)
+static long sched_group_rt_runtime(struct task_group *tg)
 {
 	u64 rt_runtime_us;
 
@@ -7479,7 +7480,7 @@ long sched_group_rt_runtime(struct task_group *tg)
 	return rt_runtime_us;
 }
 
-int sched_group_set_rt_period(struct task_group *tg, long rt_period_us)
+static int sched_group_set_rt_period(struct task_group *tg, long rt_period_us)
 {
 	u64 rt_runtime, rt_period;
 
@@ -7492,7 +7493,7 @@ int sched_group_set_rt_period(struct task_group *tg, long rt_period_us)
 	return tg_set_rt_bandwidth(tg, rt_period, rt_runtime);
 }
 
-long sched_group_rt_period(struct task_group *tg)
+static long sched_group_rt_period(struct task_group *tg)
 {
 	u64 rt_period_us;
 
@@ -7527,7 +7528,7 @@ static int sched_rt_global_constraints(void)
 	return ret;
 }
 
-int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk)
+static int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk)
 {
 	/* Don't accept realtime tasks when there is no way for them to run */
 	if (rt_task(tsk) && tg->rt_bandwidth.rt_runtime == 0)
Signature · 2 lines
Michel "Walken" Lespinasse
A program is never fully debugged until the last user dies.
#1 lore raw
Quoted 26 lines · Michel Lespinasse

Just a tiny cleanup I did while I was looking through scheduler code doing a tasklist_lock change. Please consider applying if you find it appropriate.

------------------------------8<-----------------------------------------
sched: make sched_group_{get,set}_rt_{runtime,period} functions static

These functions, as well as sched_rt_can_attach(), used to be public so that kernel/user.c could use them; however this use has now disappeared so that these functions can be made static again.

---
 include/linux/sched.h |  9 ---------
 kernel/sched/core.c   | 11 ++++++-----
 2 files changed, 6 insertions(+), 14 deletions(-)
include/linux/sched.h +0 -0
index d35d2b6ddbfb..ac8dbca5ea15 100644
@@ -2694,15 +2694,6 @@ extern void sched_move_task(struct task_struct *tsk);
 extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);
 extern unsigned long sched_group_shares(struct task_group *tg);
 #endif

include/linux/sched.h extern void sched_move_task(struct task_struct *tsk); · line 2697

Quoted 10 lines
include/linux/sched.h +0 -9
-#ifdef CONFIG_RT_GROUP_SCHED
-extern int sched_group_set_rt_runtime(struct task_group *tg,
-				      long rt_runtime_us);
-extern long sched_group_rt_runtime(struct task_group *tg);
-extern int sched_group_set_rt_period(struct task_group *tg,
-				      long rt_period_us);
-extern long sched_group_rt_period(struct task_group *tg);
-extern int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk);
-#endif
 #endif /* CONFIG_CGROUP_SCHED */

Makes sense - but Li Zefan has beaten you to it by a few days:

25cc7da7e633 sched: Move group scheduling functions out of include/linux/sched.h

Which can be found in the latest scheduler development tree, queued up for v3.10:

git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master # or sched/core

Thanks,

Ingo