From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Dave Jones <davej@codemonkey.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Richard Cochran <richardcochran@gmail.com>,
Prarit Bhargava <prarit@redhat.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 03/12] clocksource: Remove clocksource_max_deferment()
Date: Fri, 6 Mar 2015 18:49:54 -0800 [thread overview]
Message-ID: <1425696603-16878-4-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1425696603-16878-1-git-send-email-john.stultz@linaro.org>
clocksource_max_deferment() doesn't do anything useful
anymore, so zap it.
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
kernel/time/clocksource.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index e5d00e6..4988411 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -499,20 +499,6 @@ u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask)
return max_nsecs;
}
-/**
- * clocksource_max_deferment - Returns max time the clocksource should be deferred
- * @cs: Pointer to clocksource
- *
- */
-static u64 clocksource_max_deferment(struct clocksource *cs)
-{
- u64 max_nsecs;
-
- max_nsecs = clocks_calc_max_nsecs(cs->mult, cs->shift, cs->maxadj,
- cs->mask);
- return max_nsecs;
-}
-
#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
static struct clocksource *clocksource_find_best(bool oneshot, bool skipcur)
@@ -684,7 +670,8 @@ void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq)
cs->maxadj = clocksource_max_adjustment(cs);
}
- cs->max_idle_ns = clocksource_max_deferment(cs);
+ cs->max_idle_ns = clocks_calc_max_nsecs(cs->mult, cs->shift,
+ cs->maxadj, cs->mask);
}
EXPORT_SYMBOL_GPL(__clocksource_updatefreq_scale);
@@ -731,7 +718,8 @@ int clocksource_register(struct clocksource *cs)
cs->name);
/* calculate max idle time permitted for this clocksource */
- cs->max_idle_ns = clocksource_max_deferment(cs);
+ cs->max_idle_ns = clocks_calc_max_nsecs(cs->mult, cs->shift,
+ cs->maxadj, cs->mask);
mutex_lock(&clocksource_mutex);
clocksource_enqueue(cs);
--
1.9.1
next prev parent reply other threads:[~2015-03-07 2:53 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-07 2:49 [PATCH 00/12] Increased clocksource validation and cleanups (v3) John Stultz
2015-03-07 2:49 ` [PATCH 01/12] clocksource: Simplify clocks_calc_max_nsecs logic John Stultz
2015-03-07 9:20 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 02/12] clocksource: Simplify logic around clocksource wrapping saftey margins John Stultz
2015-03-07 9:22 ` Ingo Molnar
2015-03-07 2:49 ` John Stultz [this message]
2015-03-07 9:18 ` [PATCH 03/12] clocksource: Remove clocksource_max_deferment() Ingo Molnar
2015-03-07 2:49 ` [PATCH 04/12] clocksource: Add max_cycles to clocksource structure John Stultz
2015-03-07 9:54 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 05/12] time: Add debugging checks to warn if we see delays John Stultz
2015-03-07 9:22 ` Paul Bolle
2015-03-07 9:29 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 06/12] time: Add infrastructure to cap clocksource reads to the max_cycles value John Stultz
2015-03-07 9:32 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 07/12] time: Try to catch clocksource delta underflows John Stultz
2015-03-07 9:34 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 08/12] time: Add warnings when overflows or underflows are observed John Stultz
2015-03-07 9:40 ` Ingo Molnar
2015-03-09 16:50 ` John Stultz
2015-03-10 5:05 ` Ingo Molnar
2015-03-07 2:50 ` [PATCH 09/12] clocksource: Improve clocksource watchdog reporting John Stultz
2015-03-07 2:50 ` [PATCH 10/12] clocksource: Mostly kill clocksource_register() John Stultz
2015-03-07 9:45 ` Ingo Molnar
2015-03-07 2:50 ` [PATCH 11/12] sparc: Convert to using clocksource_register_hz() John Stultz
2015-03-07 9:46 ` Ingo Molnar
2015-03-07 2:50 ` [PATCH 12/12] clocksource: Add some debug info about clocksources being registered John Stultz
2015-03-07 9:50 ` Ingo Molnar
2015-03-12 3:16 ` John Stultz
-- strict thread matches above, loose matches on Subject: below --
2015-01-23 0:09 [PATCH 00/12][RFC] Increased clocksource validation and cleanups (v2) John Stultz
2015-01-23 0:09 ` [PATCH 03/12] clocksource: Remove clocksource_max_deferment() John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425696603-16878-4-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=davej@codemonkey.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=sboyd@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).