diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-07 01:36:19 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-07 01:36:19 -0500 |
| commit | 6697ec612c41aabaa51c71eaa0878217067ba81d (patch) | |
| tree | b8d95ceca211ae5d7554354582c67b892305588f | |
| parent | 52aeed7bc50cf5532b07ab0cb4fc50f20bbc71c2 (diff) | |
| download | rt-patches-6697ec612c41aabaa51c71eaa0878217067ba81d.tar.gz | |
refresh sched-Convert-thread_group_cputimer-lock-to-raw_spin.patch
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 8535a5f..884c8d4 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 752b5f5829aa99b3735dc3403bf7f7bf97c12595 Mon Sep 17 00:00:00 2001 +From 1998c8295f4a4c29056de086cae3a36e18c16f30 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 @@ -9,7 +9,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/init_task.h b/include/linux/init_task.h -index abec69b..e93b8cd 100644 +index b1ed1cd..e13501e 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -27,7 +27,7 @@ extern struct fs_struct init_fs; @@ -22,10 +22,10 @@ index abec69b..e93b8cd 100644 } diff --git a/include/linux/sched.h b/include/linux/sched.h -index 7b9b4b1..c916409 100644 +index 4f0da1a..52ed879 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -561,7 +561,7 @@ struct task_cputime { +@@ -507,7 +507,7 @@ struct task_cputime { struct thread_group_cputimer { struct task_cputime cputime; int running; @@ -34,17 +34,17 @@ index 7b9b4b1..c916409 100644 }; /* -@@ -2463,7 +2463,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); +@@ -2398,7 +2398,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); + static inline void thread_group_cputime_init(struct signal_struct *sig) { - sig->cputimer.cputime = INIT_CPUTIME; - spin_lock_init(&sig->cputimer.lock); + raw_spin_lock_init(&sig->cputimer.lock); - sig->cputimer.running = 0; } + 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 438ff45..359cc24 100644 +index 1a22dfd..d3ca17b 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 438ff45..359cc24 100644 } /* -@@ -1068,9 +1068,9 @@ static void stop_process_timers(struct task_struct *tsk) +@@ -1069,9 +1069,9 @@ static void stop_process_timers(struct task_struct *tsk) if (!cputimer->running) return; |