1 files changed, 10 insertions, 2 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index ea33f8adc032..ff82e24573b6 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1306,6 +1306,7 @@ void __cleanup_sighand(struct sighand_struct *sighand)
         }
 }
 
+#ifdef CONFIG_POSIX_TIMERS
 /*
  * Initialize POSIX timer handling for a thread group.
  */
@@ -1315,7 +1316,7 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
 
         cpu_limit = READ_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur);
         if (cpu_limit != RLIM_INFINITY) {
-                sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit);
+                sig->cputime_expires.prof_exp = cpu_limit * NSEC_PER_SEC;
                 sig->cputimer.running = true;
         }
 
@@ -1324,6 +1325,9 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
         INIT_LIST_HEAD(&sig->cpu_timers[1]);
         INIT_LIST_HEAD(&sig->cpu_timers[2]);
 }
+#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)
 {
@@ -1348,11 +1352,11 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
         init_waitqueue_head(&sig->wait_chldexit);
         sig->curr_target = tsk;
         init_sigpending(&sig->shared_pending);
-        INIT_LIST_HEAD(&sig->posix_timers);
         seqlock_init(&sig->stats_lock);
         prev_cputime_init(&sig->prev_cputime);
 
 #ifdef CONFIG_POSIX_TIMERS
+        INIT_LIST_HEAD(&sig->posix_timers);
         hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
         sig->real_timer.function = it_real_fn;
 #endif
@@ -1427,6 +1431,7 @@ static void rt_mutex_init_task(struct task_struct *p)
 #endif
 }
 
+#ifdef CONFIG_POSIX_TIMERS
 /*
  * Initialize POSIX timer handling for a single task.
  */
@@ -1439,6 +1444,9 @@ static void posix_cpu_timers_init(struct task_struct *tsk)
         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(struct task_struct *task, enum pid_type type, struct pid *pid)