diff options
-rw-r--r-- | kernel/exit.c | 2 | ||||
-rw-r--r-- | kernel/sys.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index ae2b92be5fae..b9c4d8bb72e5 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -1330,10 +1330,10 @@ static int wait_task_zombie(struct task_struct *p, int options, | |||
1330 | * group, which consolidates times for all threads in the | 1330 | * group, which consolidates times for all threads in the |
1331 | * group including the group leader. | 1331 | * group including the group leader. |
1332 | */ | 1332 | */ |
1333 | thread_group_cputime(p, &cputime); | ||
1333 | spin_lock_irq(&p->parent->sighand->siglock); | 1334 | spin_lock_irq(&p->parent->sighand->siglock); |
1334 | psig = p->parent->signal; | 1335 | psig = p->parent->signal; |
1335 | sig = p->signal; | 1336 | sig = p->signal; |
1336 | thread_group_cputime(p, &cputime); | ||
1337 | psig->cutime = | 1337 | psig->cutime = |
1338 | cputime_add(psig->cutime, | 1338 | cputime_add(psig->cutime, |
1339 | cputime_add(cputime.utime, | 1339 | cputime_add(cputime.utime, |
diff --git a/kernel/sys.c b/kernel/sys.c index 31deba8f7d16..5fc3a0cfb994 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -858,8 +858,8 @@ void do_sys_times(struct tms *tms) | |||
858 | struct task_cputime cputime; | 858 | struct task_cputime cputime; |
859 | cputime_t cutime, cstime; | 859 | cputime_t cutime, cstime; |
860 | 860 | ||
861 | spin_lock_irq(¤t->sighand->siglock); | ||
862 | thread_group_cputime(current, &cputime); | 861 | thread_group_cputime(current, &cputime); |
862 | spin_lock_irq(¤t->sighand->siglock); | ||
863 | cutime = current->signal->cutime; | 863 | cutime = current->signal->cutime; |
864 | cstime = current->signal->cstime; | 864 | cstime = current->signal->cstime; |
865 | spin_unlock_irq(¤t->sighand->siglock); | 865 | spin_unlock_irq(¤t->sighand->siglock); |