diff options
author | Frank Mayhar <fmayhar@google.com> | 2008-09-12 12:54:39 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-27 14:04:45 -0400 |
commit | 7086efe1c1536f6bc160e7d60a9bfd645b91f279 (patch) | |
tree | a5facb5a01052452547ab9a9a47a0260537127fb /kernel/sched.c | |
parent | 31d9284569e38fb97117497af3e8047a6a3c86f0 (diff) |
timers: fix itimer/many thread hang, v3
- fix UP lockup
- another set of UP/SMP cleanups and simplifications
Signed-off-by: Frank Mayhar <fmayhar@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 260c22cc530a..29a3152c45db 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4046,7 +4046,6 @@ unsigned long long task_delta_exec(struct task_struct *p) | |||
4046 | unsigned long flags; | 4046 | unsigned long flags; |
4047 | u64 ns = 0; | 4047 | u64 ns = 0; |
4048 | 4048 | ||
4049 | rq = task_rq_lock(p, &flags); | ||
4050 | if (task_current(rq, p)) { | 4049 | if (task_current(rq, p)) { |
4051 | u64 delta_exec; | 4050 | u64 delta_exec; |
4052 | 4051 | ||