Commit f200c315 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-core-2025-01-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer and timekeeping updates from Thomas Gleixner:

 - Just boring cleanups, typo and comment fixes and trivial optimizations

* tag 'timers-core-2025-01-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers/migration: Simplify top level detection on group setup
  timers: Optimize get_timer_[this_]cpu_base()
  timekeeping: Remove unused ktime_get_fast_timestamps()
  timer/migration: Fix kernel-doc warnings for union tmigr_state
  tick/broadcast: Add kernel-doc for function parameters
  hrtimers: Update the return type of enqueue_hrtimer()
  clocksource/wdtest: Print time values for short udelay(1)
  posix-timers: Fix typo in __lock_timer()
  vdso: Correct typo in PAGE_SHIFT comment
parents 33608823 dcf62305

include/linux/timekeeping.h

+0 −15
Original line number Diff line number Diff line
@@ -263,18 +263,6 @@ extern bool timekeeping_rtc_skipresume(void); 


extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta);



/**

 * struct ktime_timestamps - Simultaneous mono/boot/real timestamps

 * @mono:	Monotonic timestamp

 * @boot:	Boottime timestamp

 * @real:	Realtime timestamp

 */

struct ktime_timestamps {

	u64		mono;

	u64		boot;

	u64		real;

};



/**

 * struct system_time_snapshot - simultaneous raw/real time capture with

 *				 counter value
@@ -345,9 +333,6 @@ extern int get_device_system_crosststamp( 
 */

extern void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot);



/* NMI safe mono/boot/realtime timestamps */

extern void ktime_get_fast_timestamps(struct ktime_timestamps *snap);



/*

 * Persistent clock related interfaces

 */

include/vdso/page.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * PAGE_SHIFT determines the page size.

 *

 * Note: This definition is required because PAGE_SHIFT is used

 * in several places throuout the codebase.

 * in several places throughout the codebase.

 */

#define PAGE_SHIFT      CONFIG_PAGE_SHIFT

kernel/time/clocksource-wdtest.c

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ static int wdtest_func(void *arg) 
	udelay(1);

	j2 = clocksource_wdtest_ktime.read(&clocksource_wdtest_ktime);

	pr_info("--- tsc-like times: %lu - %lu = %lu.\n", j2, j1, j2 - j1);

	WARN_ON_ONCE(time_before(j2, j1 + NSEC_PER_USEC));

	WARN_ONCE(time_before(j2, j1 + NSEC_PER_USEC),

		  "Expected at least 1000ns, got %lu.\n", j2 - j1);



	/* Verify tsc-like stability with various numbers of errors injected. */

	max_retries = clocksource_get_max_watchdog_retry();

kernel/time/hrtimer.c

+3 −4
Original line number Diff line number Diff line
@@ -1067,10 +1067,9 @@ EXPORT_SYMBOL_GPL(hrtimer_forward); 
 * The timer is inserted in expiry order. Insertion into the

 * red black tree is O(log(n)). Must hold the base lock.

 *

 * Returns 1 when the new timer is the leftmost timer in the tree.

 * Returns true when the new timer is the leftmost timer in the tree.

 */

static int enqueue_hrtimer(struct hrtimer *timer,

			   struct hrtimer_clock_base *base,

static bool enqueue_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base,

			    enum hrtimer_mode mode)

{

	debug_activate(timer, mode);

kernel/time/posix-timers.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags) 
	 * When the reference count reaches zero, the timer is scheduled

	 * for RCU removal after the grace period.

	 *

	 * Holding rcu_read_lock() accross the lookup ensures that

	 * Holding rcu_read_lock() across the lookup ensures that

	 * the timer cannot be freed.

	 *

	 * The lookup validates locklessly that timr::it_signal ==