scheduler fixes
Subsystems (2)
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
# HEAD: a57beec5d427086cdc8d75fd51164577193fa7f4 sched: Make sched_class::get_rr_interval() optional
A crash fix and documentation updates.
Thanks,
Ingo
------------------>
Dario Faggioli (1):
sched/deadline: Add sched_dl documentation
Masanari Iida (1):
sched: Fix docbook parameter annotation error in wait.h
Peter Zijlstra (1):
sched: Make sched_class::get_rr_interval() optional
Documentation/scheduler/00-INDEX | 2 + Documentation/scheduler/sched-deadline.txt | 281 +++++++++++++++++++++++++++++ include/linux/wait.h | 4 +- kernel/sched/core.c | 4 +- kernel/sched/deadline.c | 3 +- 5 files changed, 290 insertions(+), 4 deletions(-) create mode 100644 Documentation/scheduler/sched-deadline.txt
Documentation/scheduler/00-INDEX +2 -0
@@ -10,5 +10,7 @@ sched-nice-design.txt - How and why the scheduler's nice levels are implemented. sched-rt-group.txt - real-time group scheduling. +sched-deadline.txt + - deadline scheduling. sched-stats.txt - information on schedstats (Linux Scheduler Statistics).
Documentation/scheduler/sched-deadline.txt new file +281 -0
281 lines not on this page · raw message
include/linux/wait.h +2 -2
@@ -286,8 +286,8 @@ do { \* wait_event_cmd - sleep until a condition gets true * @wq: the waitqueue to wait on * @condition: a C expression for the event to wait for -* cmd1: the command will be executed before sleep -* cmd2: the command will be executed after sleep +* @cmd1: the command will be executed before sleep +* @cmd2: the command will be executed after sleep * * The process is put to sleep (TASK_UNINTERRUPTIBLE) until the * @condition evaluates to true. The @condition is checked each time
kernel/sched/core.c +3 -1
@@ -4324,7 +4324,9 @@ SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid, goto out_unlock; rq =task_rq_lock (p, &flags); - time_slice = p->sched_class->get_rr_interval (rq, p); + time_slice =0 ; +if (p->sched_class->get_rr_interval) + time_slice = p->sched_class->get_rr_interval (rq, p);task_rq_unlock (rq, p, &flags);rcu_read_unlock ();
kernel/sched/deadline.c +2 -1
@@ -351,7 +351,8 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,* disrupting the schedulability of the system. Otherwise, we should * refill the runtime and set the deadline a period in the future, * because keeping the current (absolute) deadline of the task would -* result in breaking guarantees promised to other tasks. +* result in breaking guarantees promised to other tasks (refer to +* Documentation/scheduler/sched-deadline.txt for more informations). * * This function returns true if: *