Pull in tip/sched/core to resolve two merge conflicts: - 96fd6c65efc6 ("sched: Factor out update_other_load_avgs() from __update_blocked_others()") 5d871a63997f ("sched/fair: Move effective_cpu_util() and effective_cpu_util() in fair.c") A simple context conflict. The former added __update_blocked_others() in the same #ifdef CONFIG_SMP block that effective_cpu_util() and sched_cpu_util() are in and the latter moved those functions to fair.c. This makes __update_blocked_others() more out of place. Will follow up with a patch to relocate. - 96fd6c65efc6 ("sched: Factor out update_other_load_avgs() from __update_blocked_others()") 84d265281d6c ("sched/pelt: Use rq_clock_task() for hw_pressure") The former factored out the body of __update_blocked_others() into update_other_load_avgs(). The latter changed how update_hw_load_avg() is called in the body. Resolved by applying the change to update_other_load_avgs() instead.
Showing the changes to include/uapi (1 of 9 files). Show all
Unified · Split
| @@ -58,9 +58,9 @@ · 57 unmodified lines | |||
| 58 | * | 58 | * |
| 59 | * This is reflected by the following fields of the sched_attr structure: | 59 | * This is reflected by the following fields of the sched_attr structure: |
| 60 | * | 60 | * |
| 61 | * @sched_deadline representative of the task's deadline | 61 | * @sched_deadline representative of the task's deadline in nanoseconds |
| 62 | * @sched_runtime representative of the task's runtime | 62 | * @sched_runtime representative of the task's runtime in nanoseconds |
| 63 | * @sched_period representative of the task's period | 63 | * @sched_period representative of the task's period in nanoseconds |
| 64 | * | 64 | * |
| 65 | * Given this task model, there are a multiplicity of scheduling algorithms | 65 | * Given this task model, there are a multiplicity of scheduling algorithms |
| 66 | * and policies, that can be used to ensure all the tasks will make their | 66 | * and policies, that can be used to ensure all the tasks will make their |