diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2025-05-19 10:33:23 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2025-06-19 14:28:23 +0200 |
| commit | c7ebfbc440151ae4a66a03b0f879cbece45174c8 (patch) | |
| tree | 3d691d4d0773ca197e0db9fe44bb1e62001c2312 | |
| parent | 5ffa25f573cf524ff53660c5ff7a158ee10f23c7 (diff) | |
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
| -rw-r--r-- | kernel/time/ntp.c | 4 | ||||
| -rw-r--r-- | kernel/time/ntp_internal.h | 4 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index e28dc53194a7..9aba1bc7b2a7 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -767,8 +767,8 @@ 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, - s32 *time_tai, struct audit_ntp_data *ad) +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]; int result; diff --git a/kernel/time/ntp_internal.h b/kernel/time/ntp_internal.h index 2d3e9669730b..7084d839c207 100644 --- a/kernel/time/ntp_internal.h +++ b/kernel/time/ntp_internal.h @@ -8,8 +8,8 @@ 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, - s32 *time_tai, struct audit_ntp_data *ad); +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); #if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index e1b8e2618ca7..99b4749f0665 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -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); |