diff options
-rw-r--r-- | include/linux/sched.h | 2 | ||||
-rw-r--r-- | kernel/fork.c | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 46c6f8d5dc06..ca635c128482 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -2391,9 +2391,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); | |||
2391 | 2391 | ||
2392 | static inline void thread_group_cputime_init(struct signal_struct *sig) | 2392 | static inline void thread_group_cputime_init(struct signal_struct *sig) |
2393 | { | 2393 | { |
2394 | sig->cputimer.cputime = INIT_CPUTIME; | ||
2395 | spin_lock_init(&sig->cputimer.lock); | 2394 | spin_lock_init(&sig->cputimer.lock); |
2396 | sig->cputimer.running = 0; | ||
2397 | } | 2395 | } |
2398 | 2396 | ||
2399 | static inline void thread_group_cputime_free(struct signal_struct *sig) | 2397 | static inline void thread_group_cputime_free(struct signal_struct *sig) |
diff --git a/kernel/fork.c b/kernel/fork.c index ce2666f84d85..1beb6c303c41 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -833,17 +833,6 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig) | |||
833 | /* Thread group counters. */ | 833 | /* Thread group counters. */ |
834 | thread_group_cputime_init(sig); | 834 | thread_group_cputime_init(sig); |
835 | 835 | ||
836 | /* Expiration times and increments. */ | ||
837 | sig->it[CPUCLOCK_PROF].expires = cputime_zero; | ||
838 | sig->it[CPUCLOCK_PROF].incr = cputime_zero; | ||
839 | sig->it[CPUCLOCK_VIRT].expires = cputime_zero; | ||
840 | sig->it[CPUCLOCK_VIRT].incr = cputime_zero; | ||
841 | |||
842 | /* Cached expiration times. */ | ||
843 | sig->cputime_expires.prof_exp = cputime_zero; | ||
844 | sig->cputime_expires.virt_exp = cputime_zero; | ||
845 | sig->cputime_expires.sched_exp = 0; | ||
846 | |||
847 | cpu_limit = ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur); | 836 | cpu_limit = ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur); |
848 | if (cpu_limit != RLIM_INFINITY) { | 837 | if (cpu_limit != RLIM_INFINITY) { |
849 | sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit); | 838 | sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit); |