diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /kernel/sys.c | |
parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index ebe65c2c9873..d356d79e84ac 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -907,8 +907,8 @@ void do_sys_times(struct tms *tms) | |||
907 | struct task_cputime cputime; | 907 | struct task_cputime cputime; |
908 | cputime_t cutime, cstime; | 908 | cputime_t cutime, cstime; |
909 | 909 | ||
910 | spin_lock_irq(¤t->sighand->siglock); | ||
911 | thread_group_cputime(current, &cputime); | 910 | thread_group_cputime(current, &cputime); |
911 | spin_lock_irq(¤t->sighand->siglock); | ||
912 | cutime = current->signal->cutime; | 912 | cutime = current->signal->cutime; |
913 | cstime = current->signal->cstime; | 913 | cstime = current->signal->cstime; |
914 | spin_unlock_irq(¤t->sighand->siglock); | 914 | spin_unlock_irq(¤t->sighand->siglock); |