diff options
Diffstat (limited to 'kernel/posix-cpu-timers.c')
| -rw-r--r-- | kernel/posix-cpu-timers.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 640ded8f5c48..e7cb76dc18f5 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
| @@ -282,13 +282,13 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times) | |||
| 282 | * it. | 282 | * it. |
| 283 | */ | 283 | */ |
| 284 | thread_group_cputime(tsk, &sum); | 284 | thread_group_cputime(tsk, &sum); |
| 285 | spin_lock_irqsave(&cputimer->lock, flags); | 285 | raw_spin_lock_irqsave(&cputimer->lock, flags); |
| 286 | cputimer->running = 1; | 286 | cputimer->running = 1; |
| 287 | update_gt_cputime(&cputimer->cputime, &sum); | 287 | update_gt_cputime(&cputimer->cputime, &sum); |
| 288 | } else | 288 | } else |
| 289 | spin_lock_irqsave(&cputimer->lock, flags); | 289 | raw_spin_lock_irqsave(&cputimer->lock, flags); |
| 290 | *times = cputimer->cputime; | 290 | *times = cputimer->cputime; |
| 291 | spin_unlock_irqrestore(&cputimer->lock, flags); | 291 | raw_spin_unlock_irqrestore(&cputimer->lock, flags); |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | /* | 294 | /* |
| @@ -999,9 +999,9 @@ static void stop_process_timers(struct signal_struct *sig) | |||
| 999 | struct thread_group_cputimer *cputimer = &sig->cputimer; | 999 | struct thread_group_cputimer *cputimer = &sig->cputimer; |
| 1000 | unsigned long flags; | 1000 | unsigned long flags; |
| 1001 | 1001 | ||
| 1002 | spin_lock_irqsave(&cputimer->lock, flags); | 1002 | raw_spin_lock_irqsave(&cputimer->lock, flags); |
| 1003 | cputimer->running = 0; | 1003 | cputimer->running = 0; |
| 1004 | spin_unlock_irqrestore(&cputimer->lock, flags); | 1004 | raw_spin_unlock_irqrestore(&cputimer->lock, flags); |
| 1005 | } | 1005 | } |
| 1006 | 1006 | ||
| 1007 | static u32 onecputick; | 1007 | static u32 onecputick; |
| @@ -1291,9 +1291,9 @@ static inline int fastpath_timer_check(struct task_struct *tsk) | |||
| 1291 | if (sig->cputimer.running) { | 1291 | if (sig->cputimer.running) { |
| 1292 | struct task_cputime group_sample; | 1292 | struct task_cputime group_sample; |
| 1293 | 1293 | ||
| 1294 | spin_lock(&sig->cputimer.lock); | 1294 | raw_spin_lock(&sig->cputimer.lock); |
| 1295 | group_sample = sig->cputimer.cputime; | 1295 | group_sample = sig->cputimer.cputime; |
| 1296 | spin_unlock(&sig->cputimer.lock); | 1296 | raw_spin_unlock(&sig->cputimer.lock); |
| 1297 | 1297 | ||
| 1298 | if (task_cputime_expired(&group_sample, &sig->cputime_expires)) | 1298 | if (task_cputime_expired(&group_sample, &sig->cputime_expires)) |
| 1299 | return 1; | 1299 | return 1; |
