diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 15:51:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 15:51:43 +1000 |
| commit | fa461903f7fa480386faaaea233b29d81caca6a5 (patch) | |
| tree | ae782306fa19199c50ddc161e5d69617a757cfcd /kernel/fork.c | |
| parent | 8a2fe3a077671738a784311eeed40c4650b287d1 (diff) | |
| parent | eb9c6b238476ba13aa40d0d70db839fbe7d3e97d (diff) | |
Merge commit 'tip/auto-latest'
Conflicts:
arch/x86/include/asm/socket.h
include/linux/rcupdate.h
kernel/fork.c
kernel/trace/trace.h
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 2d7d99b7ef45..1008c1c61abd 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -63,6 +63,7 @@ #include <linux/magic.h> #include <linux/perf_counter.h> #include <linux/kmemleak.h> +#include <linux/posix-timers.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> @@ -795,10 +796,10 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig) thread_group_cputime_init(sig); /* Expiration times and increments. */ - sig->it_virt_expires = cputime_zero; - sig->it_virt_incr = cputime_zero; - sig->it_prof_expires = cputime_zero; - sig->it_prof_incr = cputime_zero; + sig->it[CPUCLOCK_PROF].expires = cputime_zero; + sig->it[CPUCLOCK_PROF].incr = cputime_zero; + sig->it[CPUCLOCK_VIRT].expires = cputime_zero; + sig->it[CPUCLOCK_VIRT].incr = cputime_zero; /* Cached expiration times. */ sig->cputime_expires.prof_exp = cputime_zero; |