Skip to content

Commit 22dc02f

Browse files
Peter Zijlstrabp3tk0v
authored andcommitted
Revert "sched/fair: Move unused stub functions to header"
Revert commit 7aa55f2 ("sched/fair: Move unused stub functions to header"), for while it has the right Changelog, the actual patch content a revert of the previous 4 patches: f7df852 ("sched: Make task_vruntime_update() prototype visible") c0bdfd7 ("sched/fair: Hide unused init_cfs_bandwidth() stub") 378be38 ("sched: Add schedule_user() declaration") d55ebae ("sched: Hide unused sched_update_scaling()") So in effect this is a revert of a revert and re-applies those patches. Fixes: 7aa55f2 ("sched/fair: Move unused stub functions to header") Reported-by: Arnd Bergmann <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]>
1 parent ac1c628 commit 22dc02f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
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-
687+
#ifdef CONFIG_SMP
688688
int sched_update_scaling(void)
689689
{
690690
unsigned int factor = get_update_sysctl_factor();
@@ -702,6 +702,7 @@ int sched_update_scaling(void)
702702
return 0;
703703
}
704704
#endif
705+
#endif
705706

706707
/*
707708
* delta /= w
@@ -6186,9 +6187,8 @@ static inline int throttled_lb_pair(struct task_group *tg,
61866187
return 0;
61876188
}
61886189

6189-
void init_cfs_bandwidth(struct cfs_bandwidth *cfs_b) {}
6190-
61916190
#ifdef CONFIG_FAIR_GROUP_SCHED
6191+
void init_cfs_bandwidth(struct cfs_bandwidth *cfs_b) {}
61926192
static void init_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}
61936193
#endif
61946194

kernel/sched/sched.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,7 @@ 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);
12481249

12491250
/*
12501251
* Helpers to check if the CPU's core cookie matches with the task's cookie
@@ -2398,6 +2399,7 @@ static inline struct cpuidle_state *idle_get_state(struct rq *rq)
23982399
#endif
23992400

24002401
extern void schedule_idle(void);
2402+
asmlinkage void schedule_user(void);
24012403

24022404
extern void sysrq_sched_debug_show(void);
24032405
extern void sched_init_granularity(void);

0 commit comments

Comments
 (0)