Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Thomas Gleixner 2025-05-19 10:33:23 +02:00
parent 5ffa25f573
commit c7ebfbc440
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/time/ntp.c
View File

@ -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 * adjtimex() mainly allows reading (and writing, if superuser) of
* kernel time-keeping variables. used by xntpd. * 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) s32 *time_tai, struct audit_ntp_data *ad)
{ {
struct ntp_data *ntpdata = &tk_ntp_data[tkid]; struct ntp_data *ntpdata = &tk_ntp_data[tkid];
int result; int result;

4
kernel/time/ntp_internal.h
View File

@ -8,8 +8,8 @@ extern void ntp_clear(unsigned int tkid);
extern u64 ntp_tick_length(unsigned int tkid); extern u64 ntp_tick_length(unsigned int tkid);
extern ktime_t ntp_get_next_leap(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 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); s32 *time_tai, struct audit_ntp_data *ad);
extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts); extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts);
#if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC) #if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC)

2
kernel/time/timekeeping.c
View File

@ -2586,7 +2586,7 @@ int do_adjtimex(struct __kernel_timex *txc)
} }
orig_tai = tai = tks->tai_offset; 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) { if (tai != orig_tai) {
__timekeeping_set_tai_offset(tks, tai); __timekeeping_set_tai_offset(tks, tai);