diff options
Diffstat (limited to 'kernel/posix-cpu-timers.c')
| -rw-r--r-- | kernel/posix-cpu-timers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 00bb252f29a2..9829646d399c 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
| @@ -363,7 +363,7 @@ int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp) | |||
| 363 | } | 363 | } |
| 364 | } else { | 364 | } else { |
| 365 | read_lock(&tasklist_lock); | 365 | read_lock(&tasklist_lock); |
| 366 | if (thread_group_leader(p) && p->signal) { | 366 | if (thread_group_leader(p) && p->sighand) { |
| 367 | error = | 367 | error = |
| 368 | cpu_clock_sample_group(which_clock, | 368 | cpu_clock_sample_group(which_clock, |
| 369 | p, &rtn); | 369 | p, &rtn); |
| @@ -439,7 +439,7 @@ int posix_cpu_timer_del(struct k_itimer *timer) | |||
| 439 | 439 | ||
| 440 | if (likely(p != NULL)) { | 440 | if (likely(p != NULL)) { |
| 441 | read_lock(&tasklist_lock); | 441 | read_lock(&tasklist_lock); |
| 442 | if (unlikely(p->signal == NULL)) { | 442 | if (unlikely(p->sighand == NULL)) { |
| 443 | /* | 443 | /* |
| 444 | * We raced with the reaping of the task. | 444 | * We raced with the reaping of the task. |
| 445 | * The deletion should have cleared us off the list. | 445 | * The deletion should have cleared us off the list. |
| @@ -691,10 +691,10 @@ int posix_cpu_timer_set(struct k_itimer *timer, int flags, | |||
| 691 | read_lock(&tasklist_lock); | 691 | read_lock(&tasklist_lock); |
| 692 | /* | 692 | /* |
| 693 | * We need the tasklist_lock to protect against reaping that | 693 | * We need the tasklist_lock to protect against reaping that |
| 694 | * clears p->signal. If p has just been reaped, we can no | 694 | * clears p->sighand. If p has just been reaped, we can no |
| 695 | * longer get any information about it at all. | 695 | * longer get any information about it at all. |
| 696 | */ | 696 | */ |
| 697 | if (unlikely(p->signal == NULL)) { | 697 | if (unlikely(p->sighand == NULL)) { |
| 698 | read_unlock(&tasklist_lock); | 698 | read_unlock(&tasklist_lock); |
| 699 | put_task_struct(p); | 699 | put_task_struct(p); |
| 700 | timer->it.cpu.task = NULL; | 700 | timer->it.cpu.task = NULL; |
| @@ -863,7 +863,7 @@ void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) | |||
| 863 | clear_dead = p->exit_state; | 863 | clear_dead = p->exit_state; |
| 864 | } else { | 864 | } else { |
| 865 | read_lock(&tasklist_lock); | 865 | read_lock(&tasklist_lock); |
| 866 | if (unlikely(p->signal == NULL)) { | 866 | if (unlikely(p->sighand == NULL)) { |
| 867 | /* | 867 | /* |
| 868 | * The process has been reaped. | 868 | * The process has been reaped. |
| 869 | * We can't even collect a sample any more. | 869 | * We can't even collect a sample any more. |
| @@ -1199,7 +1199,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer) | |||
| 1199 | spin_lock(&p->sighand->siglock); | 1199 | spin_lock(&p->sighand->siglock); |
| 1200 | } else { | 1200 | } else { |
| 1201 | read_lock(&tasklist_lock); | 1201 | read_lock(&tasklist_lock); |
| 1202 | if (unlikely(p->signal == NULL)) { | 1202 | if (unlikely(p->sighand == NULL)) { |
| 1203 | /* | 1203 | /* |
| 1204 | * The process has been reaped. | 1204 | * The process has been reaped. |
| 1205 | * We can't even collect a sample any more. | 1205 | * We can't even collect a sample any more. |
