From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751652AbdBAJ7q (ORCPT ); Wed, 1 Feb 2017 04:59:46 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54884 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751302AbdBAJ7k (ORCPT ); Wed, 1 Feb 2017 04:59:40 -0500 Date: Wed, 1 Feb 2017 01:58:31 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: paulus@samba.org, torvalds@linux-foundation.org, riel@redhat.com, tglx@linutronix.de, heiko.carstens@de.ibm.com, fenghua.yu@intel.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, hpa@zytor.com, sgruszka@redhat.com, fweisbec@gmail.com, mpe@ellerman.id.au, schwidefsky@de.ibm.com, benh@kernel.crashing.org, wanpeng.li@hotmail.com, mingo@kernel.org Reply-To: fweisbec@gmail.com, schwidefsky@de.ibm.com, mpe@ellerman.id.au, wanpeng.li@hotmail.com, benh@kernel.crashing.org, mingo@kernel.org, torvalds@linux-foundation.org, paulus@samba.org, tglx@linutronix.de, riel@redhat.com, fenghua.yu@intel.com, heiko.carstens@de.ibm.com, hpa@zytor.com, sgruszka@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, tony.luck@intel.com In-Reply-To: <1485832191-26889-18-git-send-email-fweisbec@gmail.com> References: <1485832191-26889-18-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] timers/posix-timers: Use TICK_NSEC instead of a dynamically ad-hoc calculated version Git-Commit-ID: 715eb7a9243a058a0722aa2f6ba703ede9113e76 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 715eb7a9243a058a0722aa2f6ba703ede9113e76 Gitweb: http://git.kernel.org/tip/715eb7a9243a058a0722aa2f6ba703ede9113e76 Author: Frederic Weisbecker AuthorDate: Tue, 31 Jan 2017 04:09:33 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 09:13:54 +0100 timers/posix-timers: Use TICK_NSEC instead of a dynamically ad-hoc calculated version Signed-off-by: Frederic Weisbecker Cc: Benjamin Herrenschmidt Cc: Fenghua Yu Cc: Heiko Carstens Cc: Linus Torvalds Cc: Martin Schwidefsky Cc: Michael Ellerman Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Rik van Riel Cc: Stanislaw Gruszka Cc: Thomas Gleixner Cc: Tony Luck Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1485832191-26889-18-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- kernel/time/posix-cpu-timers.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index d53ff71..8349e02 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -890,8 +890,6 @@ static inline void stop_process_timers(struct signal_struct *sig) tick_dep_clear_signal(sig, TICK_DEP_BIT_POSIX_TIMER); } -static u32 onecputick; - static void check_cpu_itimer(struct task_struct *tsk, struct cpu_itimer *it, unsigned long long *expires, unsigned long long cur_time, int signo) @@ -903,9 +901,9 @@ static void check_cpu_itimer(struct task_struct *tsk, struct cpu_itimer *it, if (it->incr) { it->expires += it->incr; it->error += it->incr_error; - if (it->error >= onecputick) { + if (it->error >= TICK_NSEC) { it->expires -= cputime_one_jiffy; - it->error -= onecputick; + it->error -= TICK_NSEC; } } else { it->expires = 0; @@ -1476,15 +1474,10 @@ static __init int init_posix_cpu_timers(void) .clock_get = thread_cpu_clock_get, .timer_create = thread_cpu_timer_create, }; - struct timespec ts; posix_timers_register_clock(CLOCK_PROCESS_CPUTIME_ID, &process); posix_timers_register_clock(CLOCK_THREAD_CPUTIME_ID, &thread); - cputime_to_timespec(cputime_one_jiffy, &ts); - onecputick = ts.tv_nsec; - WARN_ON(ts.tv_sec != 0); - return 0; } __initcall(init_posix_cpu_timers);