Commit 6b1ef640 authored by Anna-Maria Behnsen's avatar Anna-Maria Behnsen Committed by Thomas Gleixner
Browse files

timekeeping: Introduce combined timekeeping action flag 



Instead of explicitly listing all the separate timekeeping actions flags,
introduce a new one which covers all actions except TK_MIRROR action.

No functional change.

Signed-off-by: default avatarAnna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <jstultz@google.com>
Link: https://lore.kernel.org/all/20241009-devel-anna-maria-b4-timers-ptp-timekeeping-v2-14-554456a44a15@linutronix.de
parent 5aa6c43e

kernel/time/timekeeping.c

+6 −4
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define TK_MIRROR		(1 << 1)

#define TK_CLOCK_WAS_SET	(1 << 2)



#define TK_UPDATE_ALL		(TK_CLEAR_NTP | TK_CLOCK_WAS_SET)



enum timekeeping_adv_mode {

	/* Update timekeeper when a tick has passed */

	TK_ADV_TICK,
@@ -1524,7 +1526,7 @@ int do_settimeofday64(const struct timespec64 *ts) 


	tk_set_xtime(tk, ts);

out:

	timekeeping_update(&tk_core, tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);

	timekeeping_update(&tk_core, tk, TK_UPDATE_ALL | TK_MIRROR);



	write_seqcount_end(&tk_core.seq);

	raw_spin_unlock_irqrestore(&tk_core.lock, flags);
@@ -1574,7 +1576,7 @@ static int timekeeping_inject_offset(const struct timespec64 *ts) 
	tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, *ts));



error: /* even if we error out, we forwarded the time, so call update */

	timekeeping_update(&tk_core, tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);

	timekeeping_update(&tk_core, tk, TK_UPDATE_ALL | TK_MIRROR);



	write_seqcount_end(&tk_core.seq);

	raw_spin_unlock_irqrestore(&tk_core.lock, flags);
@@ -1659,7 +1661,7 @@ static int change_clocksource(void *data) 
	timekeeping_forward_now(tk);

	old = tk->tkr_mono.clock;

	tk_setup_internals(tk, new);

	timekeeping_update(&tk_core, tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);

	timekeeping_update(&tk_core, tk, TK_UPDATE_ALL | TK_MIRROR);



	write_seqcount_end(&tk_core.seq);

	raw_spin_unlock_irqrestore(&tk_core.lock, flags);
@@ -1950,7 +1952,7 @@ void timekeeping_inject_sleeptime64(const struct timespec64 *delta) 


	__timekeeping_inject_sleeptime(tk, delta);



	timekeeping_update(&tk_core, tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);

	timekeeping_update(&tk_core, tk, TK_UPDATE_ALL | TK_MIRROR);



	write_seqcount_end(&tk_core.seq);

	raw_spin_unlock_irqrestore(&tk_core.lock, flags);