1 files changed, 3 insertions, 31 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 1d1cd06edbc1..53e780748fe3 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1519,28 +1519,17 @@ void __cleanup_sighand(struct sighand_struct *sighand)
         }
 }
 
-#ifdef CONFIG_POSIX_TIMERS
 /*
  * Initialize POSIX timer handling for a thread group.
  */
 static void posix_cpu_timers_init_group(struct signal_struct *sig)
 {
+        struct posix_cputimers *pct = &sig->posix_cputimers;
         unsigned long cpu_limit;
 
         cpu_limit = READ_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur);
-        if (cpu_limit != RLIM_INFINITY) {
-                sig->cputime_expires.prof_exp = cpu_limit * NSEC_PER_SEC;
-                sig->cputimer.running = true;
-        }
-
-        /* The timer lists. */
-        INIT_LIST_HEAD(&sig->cpu_timers[0]);
-        INIT_LIST_HEAD(&sig->cpu_timers[1]);
-        INIT_LIST_HEAD(&sig->cpu_timers[2]);
+        posix_cputimers_group_init(pct, cpu_limit);
 }
-#else
-static inline void posix_cpu_timers_init_group(struct signal_struct *sig) { }
-#endif
 
 static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 {
@@ -1642,23 +1631,6 @@ static void rt_mutex_init_task(struct task_struct *p)
 #endif
 }
 
-#ifdef CONFIG_POSIX_TIMERS
-/*
- * Initialize POSIX timer handling for a single task.
- */
-static void posix_cpu_timers_init(struct task_struct *tsk)
-{
-        tsk->cputime_expires.prof_exp = 0;
-        tsk->cputime_expires.virt_exp = 0;
-        tsk->cputime_expires.sched_exp = 0;
-        INIT_LIST_HEAD(&tsk->cpu_timers[0]);
-        INIT_LIST_HEAD(&tsk->cpu_timers[1]);
-        INIT_LIST_HEAD(&tsk->cpu_timers[2]);
-}
-#else
-static inline void posix_cpu_timers_init(struct task_struct *tsk) { }
-#endif
-
 static inline void init_task_pid_links(struct task_struct *task)
 {
         enum pid_type type;
@@ -1945,7 +1917,7 @@ static __latent_entropy struct task_struct *copy_process(
         task_io_accounting_init(&p->ioac);
         acct_clear_integrals(p);
 
-        posix_cpu_timers_init(p);
+        posix_cputimers_init(&p->posix_cputimers);
 
         p->io_context = NULL;
         audit_set_context(p, NULL);