lkml.org 
[lkml]   [2008]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.25.8-rt7
>>> On Tue, Jun 24, 2008 at 10:44 AM, in message
<Pine.LNX.4.58.0806241043070.32368@gandalf.stny.rr.com>, Steven Rostedt
<rostedt@goodmis.org> wrote:

> On Tue, 24 Jun 2008, Gregory Haskins wrote:
>
>>
>> (Sorry for toppost)
>>
>> I believe this is my fault. You must be building for uniprocessor? Ingo
> has a fix for this issue in sched-devel that should be pulled into -rt.
>>
>> Sorry for the inconvenience. I will pull the patch myself and submit it
> when I get home (if someone doesn't beat me to it)
>>
>
> I'm looking forward to it ;-)

Patch is attached (from linux-2.6-tip). I meant to send this back around when the
offending patch went in, but it slipped through the cracks. Sorry for the
inconvenience.

Regards,
-Greg

From 1100ac91b6af02d8639d518fad5b434b1bf44ed6 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 5 Jun 2008 12:25:37 +0200
Subject: [PATCH] sched: fix cpuprio build bug

this patch was not built on !SMP:

kernel/sched_rt.c: In function 'inc_rt_tasks':
kernel/sched_rt.c:404: error: 'struct rq' has no member named 'online'

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/sched_rt.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index e482159..eaa6060 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -399,16 +399,19 @@ void inc_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
#if defined CONFIG_SMP || defined CONFIG_RT_GROUP_SCHED
if (rt_se_prio(rt_se) < rt_rq->highest_prio) {
struct rq *rq = rq_of_rt_rq(rt_rq);
- rt_rq->highest_prio = rt_se_prio(rt_se);

+ rt_rq->highest_prio = rt_se_prio(rt_se);
+#ifdef CONFIG_SMP
if (rq->online)
cpupri_set(&rq->rd->cpupri, rq->cpu,
rt_se_prio(rt_se));
+#endif
}
#endif
#ifdef CONFIG_SMP
if (rt_se->nr_cpus_allowed > 1) {
struct rq *rq = rq_of_rt_rq(rt_rq);
+
rq->rt.rt_nr_migratory++;
}

--
1.5.4.5
\
 
 \ /
  Last update: 2008-06-24 17:19    [W:0.048 / U:0.216 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site