diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-08 16:17:19 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-08 16:17:19 -0500 |
| commit | 162ece4b96277815ba4816c7b78130becf0a7b89 (patch) | |
| tree | d50d5c601c58cb9b113d67f494e46852e0f6a8ca | |
| parent | 8c245c4855934ccbea0ea73f8c5fa0d76a449ce4 (diff) | |
| download | rt-patches-162ece4b96277815ba4816c7b78130becf0a7b89.tar.gz | |
refresh sched-Convert-thread_group_cputimer-lock-to-raw_spin.patchv2.6.34-rc2-344-g7b12887v2.6.34-rc2-342-g6631424v2.6.34-rc2-308-gc45140av2.6.34-rc2-303-gad4ba05v2.6.34-rc2-297-g376a21fv2.6.34-rc2-288-gb72c409v2.6.34-rc2-269-ge4d5042v2.6.34-rc2-265-g6f063aev2.6.34-rc2-259-gf3845f3v2.6.34-rc2-255-g054319b
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | sched-Convert-thread_group_cputimer-lock-to-raw_spin.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sched-Convert-thread_group_cputimer-lock-to-raw_spin.patch b/sched-Convert-thread_group_cputimer-lock-to-raw_spin.patch index 884c8d4..36b876e 100644 --- a/sched-Convert-thread_group_cputimer-lock-to-raw_spin.patch +++ b/sched-Convert-thread_group_cputimer-lock-to-raw_spin.patch @@ -1,4 +1,4 @@ -From 1998c8295f4a4c29056de086cae3a36e18c16f30 Mon Sep 17 00:00:00 2001 +From 80221fdbb9fd515ccd114825467c27841f9a8945 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Sat, 25 Jul 2009 18:56:56 +0200 Subject: [PATCH] sched: Convert thread_group_cputimer lock to raw_spinlock @@ -22,10 +22,10 @@ index b1ed1cd..e13501e 100644 } diff --git a/include/linux/sched.h b/include/linux/sched.h -index 4f0da1a..52ed879 100644 +index df60e1a..fbc74a0 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -507,7 +507,7 @@ struct task_cputime { +@@ -511,7 +511,7 @@ struct task_cputime { struct thread_group_cputimer { struct task_cputime cputime; int running; @@ -34,7 +34,7 @@ index 4f0da1a..52ed879 100644 }; /* -@@ -2398,7 +2398,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); +@@ -2402,7 +2402,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); static inline void thread_group_cputime_init(struct signal_struct *sig) { @@ -44,7 +44,7 @@ index 4f0da1a..52ed879 100644 static inline void thread_group_cputime_free(struct signal_struct *sig) diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c -index 1a22dfd..d3ca17b 100644 +index bc7704b..8997bd7 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -280,7 +280,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times) @@ -65,7 +65,7 @@ index 1a22dfd..d3ca17b 100644 } /* -@@ -1069,9 +1069,9 @@ static void stop_process_timers(struct task_struct *tsk) +@@ -1069,9 +1069,9 @@ static void stop_process_timers(struct signal_struct *sig) if (!cputimer->running) return; @@ -74,9 +74,9 @@ index 1a22dfd..d3ca17b 100644 cputimer->running = 0; - spin_unlock_irqrestore(&cputimer->lock, flags); + raw_spin_unlock_irqrestore(&cputimer->lock, flags); - } - static u32 onecputick; + sig->cputime_expires.prof_exp = cputime_zero; + sig->cputime_expires.virt_exp = cputime_zero; diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h index 32d2bd4..9ecca2f 100644 --- a/kernel/sched_stats.h @@ -118,5 +118,5 @@ index 32d2bd4..9ecca2f 100644 + raw_spin_unlock(&cputimer->lock); } -- -1.7.1.1 +1.7.0.4 |