Attachment 298650 Details for Bug 438217 – Hiroshi-san's patch for 2.6.24.3-29.el5rt kernel

Hiroshi-san's patch for 2.6.24.3-29.el5rt kernel

hiroshi_scheduler_fix.patch (text/plain), 2.03 KB, created by IBM Bug Proxy on 2008-03-20 07:57:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2008-03-20 07:57:15 UTC

Size: 2.03 KB

patch

obsolete

>Index: linux-2.6.24.3.x86_64/kernel/sched.c
>===================================================================
>--- linux-2.6.24.3.x86_64.orig/kernel/sched.c	2008-03-20 11:32:39.000000000 +0530
>+++ linux-2.6.24.3.x86_64/kernel/sched.c	2008-03-20 11:36:03.000000000 +0530
>@@ -4332,11 +4332,10 @@
> 	oldprio = p->prio;
> 	on_rq = p->se.on_rq;
> 	running = task_current(rq, p);
>-	if (on_rq) {
>+	if (on_rq)
> 		dequeue_task(rq, p, 0);
>-		if (running)
>-			p->sched_class->put_prev_task(rq, p);
>-	}
>+	if (running)
>+		p->sched_class->put_prev_task(rq, p);
> 
> 	if (rt_prio(prio))
> 		p->sched_class = &rt_sched_class;
>@@ -4348,10 +4347,9 @@
> //	trace_special_pid(p->pid, __PRIO(oldprio), PRIO(p));
> 	prev_resched = _need_resched();
> 
>+	if (running)
>+		p->sched_class->set_curr_task(rq);
> 	if (on_rq) {
>-		if (running)
>-			p->sched_class->set_curr_task(rq);
>-
> 		enqueue_task(rq, p, 0);
> 
> 		check_class_changed(rq, p, prev_class, oldprio, running);
>@@ -4640,19 +4638,17 @@
> 	update_rq_clock(rq);
> 	on_rq = p->se.on_rq;
> 	running = task_current(rq, p);
>-	if (on_rq) {
>+	if (on_rq)
> 		deactivate_task(rq, p, 0);
>-		if (running)
>-			p->sched_class->put_prev_task(rq, p);
>-	}
>+	if (running)
>+		p->sched_class->put_prev_task(rq, p);
> 
> 	oldprio = p->prio;
> 	__setscheduler(rq, p, policy, param->sched_priority);
> 
>+	if (running)
>+		p->sched_class->set_curr_task(rq);
> 	if (on_rq) {
>-		if (running)
>-			p->sched_class->set_curr_task(rq);
>-
> 		activate_task(rq, p, 0);
> 
> 		check_class_changed(rq, p, prev_class, oldprio, running);
>@@ -7656,19 +7652,17 @@
> 	running = task_current(rq, tsk);
> 	on_rq = tsk->se.on_rq;
> 
>-	if (on_rq) {
>+	if (on_rq)
> 		dequeue_task(rq, tsk, 0);
>-		if (unlikely(running))
>-			tsk->sched_class->put_prev_task(rq, tsk);
>-	}
>+	if (unlikely(running))
>+		tsk->sched_class->put_prev_task(rq, tsk);
> 
> 	set_task_cfs_rq(tsk, task_cpu(tsk));
> 
>-	if (on_rq) {
>-		if (unlikely(running))
>-			tsk->sched_class->set_curr_task(rq);
>+	if (unlikely(running))
>+		tsk->sched_class->set_curr_task(rq);
>+	if (on_rq)
> 		enqueue_task(rq, tsk, 0);
>-	}
> 
> done:
> 	task_rq_unlock(rq, &flags);

Actions: View

Attachments on bug 438217: 298564 | 298565 | 298566 | 298567 | 298650