Skip to content

Commit c7ebfbc

Browse files
committed
ntp: Rename __do_adjtimex() to ntp_adjtimex()
Clean up the name space. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: John Stultz <jstultz@google.com> Link: https://lore.kernel.org/all/20250519083026.095637820@linutronix.de
1 parent 5ffa25f commit c7ebfbc

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

kernel/time/ntp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ static inline void process_adjtimex_modes(struct ntp_data *ntpdata, const struct
767767
* adjtimex() mainly allows reading (and writing, if superuser) of
768768
* kernel time-keeping variables. used by xntpd.
769769
*/
770-
int __do_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,
771-
s32 *time_tai, struct audit_ntp_data *ad)
770+
int ntp_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,
771+
s32 *time_tai, struct audit_ntp_data *ad)
772772
{
773773
struct ntp_data *ntpdata = &tk_ntp_data[tkid];
774774
int result;

kernel/time/ntp_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ extern void ntp_clear(unsigned int tkid);
88
extern u64 ntp_tick_length(unsigned int tkid);
99
extern ktime_t ntp_get_next_leap(unsigned int tkid);
1010
extern int second_overflow(unsigned int tkid, time64_t secs);
11-
extern int __do_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,
12-
s32 *time_tai, struct audit_ntp_data *ad);
11+
extern int ntp_adjtimex(unsigned int tkid, struct __kernel_timex *txc, const struct timespec64 *ts,
12+
s32 *time_tai, struct audit_ntp_data *ad);
1313
extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts);
1414

1515
#if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC)

kernel/time/timekeeping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2586,7 +2586,7 @@ int do_adjtimex(struct __kernel_timex *txc)
25862586
}
25872587

25882588
orig_tai = tai = tks->tai_offset;
2589-
ret = __do_adjtimex(tks->id, txc, &ts, &tai, &ad);
2589+
ret = ntp_adjtimex(tks->id, txc, &ts, &tai, &ad);
25902590

25912591
if (tai != orig_tai) {
25922592
__timekeeping_set_tai_offset(tks, tai);

0 commit comments

Comments
 (0)