summaryrefslogtreecommitdiffstats
path: root/sched-fix-dequeued-race.patch
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-29 18:07:33 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-29 18:07:33 -0500
commit6e60c7a22076759644cd28a5da5e1e5d9ac24a90 (patch)
tree568cf93c2de16cc337876c8c7bd33433c917d39a /sched-fix-dequeued-race.patch
parentba748d7520f5326e5f6439b37d6bb65a18e8b5c1 (diff)
downloadrt-patches-6e60c7a22076759644cd28a5da5e1e5d9ac24a90.tar.gz
refresh sched-fix-dequeued-race.patchv2.6.33-1719-g6556a67
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'sched-fix-dequeued-race.patch')
-rw-r--r--sched-fix-dequeued-race.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/sched-fix-dequeued-race.patch b/sched-fix-dequeued-race.patch
index 8044cf8..9c1dcd9 100644
--- a/sched-fix-dequeued-race.patch
+++ b/sched-fix-dequeued-race.patch
@@ -1,4 +1,4 @@
-From 0ab0f46f4380b65dd8732249b5b237fb1c36272f Mon Sep 17 00:00:00 2001
+From 346478ac572d231272f99d042355cd6f85e3f6a8 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 3 Jul 2009 08:44:26 -0500
Subject: [PATCH] sched:-fix dequeued race
@@ -10,10 +10,10 @@ Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/sched.c b/kernel/sched.c
-index 2e9167b..0ebeac1 100644
+index fe8d8d3..fa83e6f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -5485,7 +5485,8 @@ void scheduler_tick(void)
+@@ -5496,7 +5496,8 @@ void scheduler_tick(void)
raw_spin_lock(&rq->lock);
update_rq_clock(rq);
update_cpu_load(rq);
@@ -22,7 +22,7 @@ index 2e9167b..0ebeac1 100644
+ curr->sched_class->task_tick(rq, curr, 0);
raw_spin_unlock(&rq->lock);
- perf_event_task_tick(curr, cpu);
+ perf_event_task_tick(curr);
--
-1.7.1.1
+1.7.1