Commit c7ebfbc4 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

ntp: Rename __do_adjtimex() to ntp_adjtimex() 



Clean up the name space. No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <jstultz@google.com>
Link: https://lore.kernel.org/all/20250519083026.095637820@linutronix.de
parent 5ffa25f5

kernel/time/ntp.c

+2 −2
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static inline void process_adjtimex_modes(struct ntp_data *ntpdata, const struct 
 * adjtimex() mainly allows reading (and writing, if superuser) of

 * kernel time-keeping variables. used by xntpd.

 */

int __do_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,

int ntp_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,

		 s32 *time_tai, struct audit_ntp_data *ad)

{

	struct ntp_data *ntpdata = &tk_ntp_data[tkid];

kernel/time/ntp_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ extern void ntp_clear(unsigned int tkid); 
extern u64 ntp_tick_length(unsigned int tkid);

extern ktime_t ntp_get_next_leap(unsigned int tkid);

extern int second_overflow(unsigned int tkid, time64_t secs);

extern int __do_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,

extern int ntp_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,

			s32 *time_tai, struct audit_ntp_data *ad);

extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts);

kernel/time/timekeeping.c

+1 −1
Original line number Diff line number Diff line
@@ -2586,7 +2586,7 @@ int do_adjtimex(struct __kernel_timex *txc) 
		}



		orig_tai = tai = tks->tai_offset;

		ret = __do_adjtimex(tks->id, txc, &ts, &tai, &ad);

		ret = ntp_adjtimex(tks->id, txc, &ts, &tai, &ad);



		if (tai != orig_tai) {

			__timekeeping_set_tai_offset(tks, tai);