diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-08 12:52:36 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-08 12:52:36 -0500 |
commit | 05560c0e77192b01b902ba79582fd15e7b8fbf24 (patch) | |
tree | ec6aef554699a4e47cc69fe66b446d95aa1c91f6 | |
parent | 4b2d00c71110e4fea30ba09cd2e370f7ad2bad8f (diff) | |
download | rt-patches-05560c0e77192b01b902ba79582fd15e7b8fbf24.tar.gz |
add warning to TASK_WAKING .35 cherry pickv2.6.34-rc1-797-g80a1860
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | sched-move_task_off_dead_cpu-Remove-retry-logic.patch | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sched-move_task_off_dead_cpu-Remove-retry-logic.patch b/sched-move_task_off_dead_cpu-Remove-retry-logic.patch index a5d83e6..0921edc 100644 --- a/sched-move_task_off_dead_cpu-Remove-retry-logic.patch +++ b/sched-move_task_off_dead_cpu-Remove-retry-logic.patch @@ -16,11 +16,17 @@ be visible to racer, it should migrate the task to online cpu correctly. [ upstream commit: c1804d547dc098363443667609c272d1e4d15ee8 ] +[PG: warning; this differs from upstream by the critical change: + - needs_cpu = (task_cpu(p) == dead_cpu) && (p->state != TASK_WAKING); + + needs_cpu = (task_cpu(p) == dead_cpu) && !(p->state & TASK_WAKING); + which makes a big difference when on RT, TASK_WAKING is not exclusive.] + Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <20100315091014.GA9138@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/sched.c b/kernel/sched.c index 30e59b6..dfc2d66 100644 |