Skip to content

Commit 7aa55f2

Browse files
arndbPeter Zijlstra
authored andcommitted
sched/fair: Move unused stub functions to header
These four functions have a normal definition for CONFIG_FAIR_GROUP_SCHED, and empty one that is only referenced when FAIR_GROUP_SCHED is disabled but CGROUP_SCHED is still enabled. If both are turned off, the functions are still defined but the misisng prototype causes a W=1 warning: kernel/sched/fair.c:12544:6: error: no previous prototype for 'free_fair_sched_group' kernel/sched/fair.c:12546:5: error: no previous prototype for 'alloc_fair_sched_group' kernel/sched/fair.c:12553:6: error: no previous prototype for 'online_fair_sched_group' kernel/sched/fair.c:12555:6: error: no previous prototype for 'unregister_fair_sched_group' Move the alternatives into the header as static inline functions with the correct combination of #ifdef checks to avoid the warning without adding even more complexity. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Vincent Guittot <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f7df852 commit 7aa55f2

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

kernel/sched/fair.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ struct sched_entity *__pick_last_entity(struct cfs_rq *cfs_rq)
684684
/**************************************************************
685685
* Scheduling class statistics methods:
686686
*/
687-
#ifdef CONFIG_SMP
687+
688688
int sched_update_scaling(void)
689689
{
690690
unsigned int factor = get_update_sysctl_factor();
@@ -702,7 +702,6 @@ int sched_update_scaling(void)
702702
return 0;
703703
}
704704
#endif
705-
#endif
706705

707706
/*
708707
* delta /= w
@@ -6169,8 +6168,9 @@ static inline int throttled_lb_pair(struct task_group *tg,
61696168
return 0;
61706169
}
61716170

6172-
#ifdef CONFIG_FAIR_GROUP_SCHED
61736171
void init_cfs_bandwidth(struct cfs_bandwidth *cfs_b) {}
6172+
6173+
#ifdef CONFIG_FAIR_GROUP_SCHED
61746174
static void init_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}
61756175
#endif
61766176

kernel/sched/sched.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,6 @@ static inline raw_spinlock_t *__rq_lockp(struct rq *rq)
12451245

12461246
bool cfs_prio_less(const struct task_struct *a, const struct task_struct *b,
12471247
bool fi);
1248-
void task_vruntime_update(struct rq *rq, struct task_struct *p, bool in_fi);
12491248

12501249
/*
12511250
* Helpers to check if the CPU's core cookie matches with the task's cookie
@@ -2377,7 +2376,6 @@ static inline struct cpuidle_state *idle_get_state(struct rq *rq)
23772376
#endif
23782377

23792378
extern void schedule_idle(void);
2380-
asmlinkage void schedule_user(void);
23812379

23822380
extern void sysrq_sched_debug_show(void);
23832381
extern void sched_init_granularity(void);

0 commit comments

Comments
 (0)