All of lore.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot2 for Adrian Hunter" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Adrian Hunter <adrian.hunter@intel.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] timekeeping: Rename fast_tk_get_delta_ns() to __timekeeping_get_ns()
Date: Mon, 08 Apr 2024 13:10:37 -0000	[thread overview]
Message-ID: <171258183799.10875.775118297225382255.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240325064023.2997-11-adrian.hunter@intel.com>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     a729a63c6b2ebd8bc37646519d404f005ea8f1b2
Gitweb:        https://git.kernel.org/tip/a729a63c6b2ebd8bc37646519d404f005ea8f1b2
Author:        Adrian Hunter <adrian.hunter@intel.com>
AuthorDate:    Mon, 25 Mar 2024 08:40:14 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 08 Apr 2024 15:03:07 +02:00

timekeeping: Rename fast_tk_get_delta_ns() to __timekeeping_get_ns()

Rename fast_tk_get_delta_ns() to __timekeeping_get_ns() to prepare for its
reuse as a general timekeeping helper function.

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240325064023.2997-11-adrian.hunter@intel.com

---
 kernel/time/timekeeping.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 3375f0a..6306133 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -390,7 +390,7 @@ static inline u64 timekeeping_cycles_to_ns(const struct tk_read_base *tkr, u64 c
 	return timekeeping_delta_to_ns(tkr, delta);
 }
 
-static __always_inline u64 fast_tk_get_delta_ns(struct tk_read_base *tkr)
+static __always_inline u64 __timekeeping_get_ns(const struct tk_read_base *tkr)
 {
 	u64 delta, cycles = tk_clock_read(tkr);
 
@@ -449,7 +449,7 @@ static __always_inline u64 __ktime_get_fast_ns(struct tk_fast *tkf)
 		seq = raw_read_seqcount_latch(&tkf->seq);
 		tkr = tkf->base + (seq & 0x01);
 		now = ktime_to_ns(tkr->base);
-		now += fast_tk_get_delta_ns(tkr);
+		now += __timekeeping_get_ns(tkr);
 	} while (raw_read_seqcount_latch_retry(&tkf->seq, seq));
 
 	return now;
@@ -565,7 +565,7 @@ static __always_inline u64 __ktime_get_real_fast(struct tk_fast *tkf, u64 *mono)
 		tkr = tkf->base + (seq & 0x01);
 		basem = ktime_to_ns(tkr->base);
 		baser = ktime_to_ns(tkr->base_real);
-		delta = fast_tk_get_delta_ns(tkr);
+		delta = __timekeeping_get_ns(tkr);
 	} while (raw_read_seqcount_latch_retry(&tkf->seq, seq));
 
 	if (mono)

  reply	other threads:[~2024-04-08 13:10 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-25  6:40 [PATCH V2 00/19] timekeeping: Handle potential multiplication overflow Adrian Hunter
2024-03-25  6:40 ` Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 01/19] vdso: Consolidate vdso_calc_delta() Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 02/19] vdso: Consolidate nanoseconds calculation Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 03/19] vdso: Add CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 04/19] math64: Tidy mul_u64_u32_shr() Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] math64: Tidy up mul_u64_u32_shr() tip-bot2 for Adrian Hunter
2024-04-24 15:11   ` [PATCH V2 04/19] math64: Tidy mul_u64_u32_shr() Peter Zijlstra
2024-04-24 15:11     ` Peter Zijlstra
2024-03-25  6:40 ` [PATCH V2 05/19] vdso: math64: Provide mul_u64_u32_add_u64_shr() Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] vdso, " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 06/19] vdso: Add vdso_data::max_cycles Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] vdso: Add vdso_data:: Max_cycles tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 07/19] vdso: Make delta calculation overflow safe Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 08/19] x86/vdso: " Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 09/19] timekeeping: Move timekeeping helper functions Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 10/19] timekeeping: Rename fast_tk_get_delta_ns() to __timekeeping_get_ns() Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` tip-bot2 for Adrian Hunter [this message]
2024-03-25  6:40 ` [PATCH V2 11/19] timekeeping: Tidy timekeeping_cycles_to_ns() slightly Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 12/19] timekeeping: Reuse timekeeping_cycles_to_ns() Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 13/19] timekeeping: Refactor timekeeping helpers Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 14/19] timekeeping: Consolidate " Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 15/19] timekeeping: Fold in timekeeping_delta_to_ns() Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 16/19] timekeeping: Prepare timekeeping_cycles_to_ns() for overflow safety Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 17/19] timekeeping: Make delta calculation overflow safe Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 18/19] timekeeping: Let timekeeping_cycles_to_ns() handle both under and overflow Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 19/19] clocksource: Make watchdog and suspend-timing multiplication overflow safe Adrian Hunter
2024-03-25  6:40   ` Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25 18:11 ` [PATCH V2 00/19] timekeeping: Handle potential multiplication overflow Arnd Bergmann

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=171258183799.10875.775118297225382255.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=adrian.hunter@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.