From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753338AbbDBDgq (ORCPT ); Wed, 1 Apr 2015 23:36:46 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:33678 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004AbbDBDfL (ORCPT ); Wed, 1 Apr 2015 23:35:11 -0400 From: John Stultz To: lkml Cc: John Stultz , Ingo Molnar , Thomas Gleixner , Peter Zijlstra , Prarit Bhargava , Richard Cochran Subject: [PATCH 20/21] timekeeping: Change timekeeping_check_update() to take a tk_read_base Date: Wed, 1 Apr 2015 20:34:40 -0700 Message-Id: <1427945681-29972-21-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427945681-29972-1-git-send-email-john.stultz@linaro.org> References: <1427945681-29972-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo noted there was no reason to pass the timekeeper structure to timekeeping_check_update(), and the tk_read_base would be fine, which simplifies the amount of dereferencing to get to values we care about. So this patch simply changes the function as suggested. Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Prarit Bhargava Cc: Richard Cochran Signed-off-by: John Stultz --- kernel/time/timekeeping.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index fe91e8e..676896e 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -131,11 +131,11 @@ static int timekeeping_overflow_seen; /* last_warning is only modified under the timekeeping lock */ static long timekeeping_last_warning; -static void timekeeping_check_update(struct timekeeper *tk, cycle_t offset) +static void timekeeping_check_update(struct tk_read_base *tkr, cycle_t offset) { - cycle_t max_cycles = tk->tkr_mono.clock->max_cycles; - const char *name = tk->tkr_mono.clock->name; + cycle_t max_cycles = tkr->clock->max_cycles; + const char *name = tkr->clock->name; if (offset > max_cycles) { printk_deferred("WARNING: timekeeping: Cycle offset (%lld) is larger than allowed by the '%s' clock's max_cycles value (%lld): time overflow danger\n", @@ -210,7 +210,7 @@ static inline cycle_t timekeeping_get_delta(struct tk_read_base *tkr) return delta; } #else -static inline void timekeeping_check_update(struct timekeeper *tk, cycle_t offset) +static inline void timekeeping_check_update(struct tk_read_base *tkr, cycle_t offset) { } static inline cycle_t timekeeping_get_delta(struct tk_read_base *tkr) @@ -1794,7 +1794,7 @@ void update_wall_time(void) goto out; /* Do some additional sanity checking */ - timekeeping_check_update(real_tk, offset); + timekeeping_check_update(&real_tk->tkr_mono, offset); /* * With NO_HZ we may have to accumulate many cycle_intervals -- 1.9.1