diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2017-01-30 22:09:34 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 03:13:54 -0500 |
commit | ebd7e7fc4bc63be5eaf9da903b8060b02dd711ea (patch) | |
tree | ac4a9204986f4b9f4a59ec798ecb6ffcaf3a0781 /kernel/fork.c | |
parent | 715eb7a9243a058a0722aa2f6ba703ede9113e76 (diff) |
timers/posix-timers: Convert internals to use nsecs
Use the new nsec based cputime accessors as part of the whole cputime
conversion from cputime_t to nsecs.
Also convert posix-cpu-timers to use nsec based internal counters to
simplify it.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-19-git-send-email-fweisbec@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 11c5c8ab827c..09992ff2f8fa 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -1313,7 +1313,7 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig) | |||
1313 | 1313 | ||
1314 | cpu_limit = READ_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur); | 1314 | cpu_limit = READ_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur); |
1315 | if (cpu_limit != RLIM_INFINITY) { | 1315 | if (cpu_limit != RLIM_INFINITY) { |
1316 | sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit); | 1316 | sig->cputime_expires.prof_exp = cpu_limit * NSEC_PER_SEC; |
1317 | sig->cputimer.running = true; | 1317 | sig->cputimer.running = true; |
1318 | } | 1318 | } |
1319 | 1319 | ||