update_vsyscall() did not provide the wall_to_monotoinc offset, so arch specific implementations tend to reference wall_to_monotonic directly. This limits future cleanups in the timekeeping core, so this patch fixes the update_vsyscall interface to provide wall_to_monotonic, allowing wall_to_monotonic to be made static as planned in Documentation/feature-removal-schedule.txt
Unified · Split
| @@ -471,7 +471,8 @@ void update_vsyscall_tz(void) · 470 unmodified lines | ||
| 471 | 471 | { |
| 472 | 472 | } |
| 473 | 473 | |
| 474 | −void update_vsyscall(struct timespec *wall, struct clocksource *c, u32 mult) | |
| 474 | +void update_vsyscall(struct timespec *wall, struct timespec *wtm, | |
| 475 | + struct clocksource *c, u32 mult) | |
| 475 | 476 | { |
| 476 | 477 | unsigned long flags; |
| 477 | 478 | |
| @@ -487,9 +488,9 @@ void update_vsyscall(struct timespec *wall, struct clocksource *c, u32 mult) · 9 unmodified lines | ||
| 487 | 488 | /* copy kernel time structures */ |
| 488 | 489 | fsyscall_gtod_data.wall_time.tv_sec = wall->tv_sec; |
| 489 | 490 | fsyscall_gtod_data.wall_time.tv_nsec = wall->tv_nsec; |
| 490 | − fsyscall_gtod_data.monotonic_time.tv_sec = wall_to_monotonic.tv_sec | |
| 491 | + fsyscall_gtod_data.monotonic_time.tv_sec = wtm->tv_sec | |
| 491 | 492 | + wall->tv_sec; |
| 492 | − fsyscall_gtod_data.monotonic_time.tv_nsec = wall_to_monotonic.tv_nsec | |
| 493 | + fsyscall_gtod_data.monotonic_time.tv_nsec = wtm->tv_nsec | |
| 493 | 494 | + wall->tv_nsec; |
| 494 | 495 | |
| 495 | 496 | /* normalize */ |
| @@ -849,8 +849,8 @@ static cycle_t timebase_read(struct clocksource *cs) · 848 unmodified lines | ||
| 849 | 849 | return (cycle_t)get_tb(); |
| 850 | 850 | } |
| 851 | 851 | |
| 852 | −void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, | |
| 853 | − u32 mult) | |
| 852 | +void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, | |
| 853 | + struct clocksource *clock, u32 mult) | |
| 854 | 854 | { |
| 855 | 855 | u64 new_tb_to_xs, new_stamp_xsec; |
| 856 | 856 | |
| @@ -882,8 +882,8 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, · 25 unmodified lines | ||
| 882 | 882 | vdso_data->tb_orig_stamp = clock->cycle_last; |
| 883 | 883 | vdso_data->stamp_xsec = new_stamp_xsec; |
| 884 | 884 | vdso_data->tb_to_xs = new_tb_to_xs; |
| 885 | − vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec; | |
| 886 | − vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec; | |
| 885 | + vdso_data->wtom_clock_sec = wtm->tv_sec; | |
| 886 | + vdso_data->wtom_clock_nsec = wtm->tv_nsec; | |
| 887 | 887 | vdso_data->stamp_xtime = *wall_time; |
| 888 | 888 | smp_wmb(); |
| 889 | 889 | ++(vdso_data->tb_update_count); |
| @@ -207,8 +207,8 @@ struct clocksource * __init clocksource_default_clock(void) · 206 unmodified lines | ||
| 207 | 207 | return &clocksource_tod; |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | −void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, | |
| 211 | − u32 mult) | |
| 210 | +void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, | |
| 211 | + struct clocksource *clock, u32 mult) | |
| 212 | 212 | { |
| 213 | 213 | if (clock != &clocksource_tod) |
| 214 | 214 | return; |
| @@ -219,8 +219,8 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, · 4 unmodified lines | ||
| 219 | 219 | vdso_data->xtime_tod_stamp = clock->cycle_last; |
| 220 | 220 | vdso_data->xtime_clock_sec = wall_time->tv_sec; |
| 221 | 221 | vdso_data->xtime_clock_nsec = wall_time->tv_nsec; |
| 222 | − vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec; | |
| 223 | − vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec; | |
| 222 | + vdso_data->wtom_clock_sec = wtm->tv_sec; | |
| 223 | + vdso_data->wtom_clock_nsec = wtm->tv_nsec; | |
| 224 | 224 | vdso_data->ntp_mult = mult; |
| 225 | 225 | smp_wmb(); |
| 226 | 226 | ++vdso_data->tb_update_count; |
| @@ -73,8 +73,8 @@ void update_vsyscall_tz(void) · 72 unmodified lines | ||
| 73 | 73 | write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | −void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, | |
| 77 | − u32 mult) | |
| 76 | +void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, | |
| 77 | + struct clocksource *clock, u32 mult) | |
| 78 | 78 | { |
| 79 | 79 | unsigned long flags; |
| 80 | 80 | |
| @@ -87,7 +87,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, · 6 unmodified lines | ||
| 87 | 87 | vsyscall_gtod_data.clock.shift = clock->shift; |
| 88 | 88 | vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec; |
| 89 | 89 | vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; |
| 90 | − vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; | |
| 90 | + vsyscall_gtod_data.wall_to_monotonic = *wtm; | |
| 91 | 91 | vsyscall_gtod_data.wall_time_coarse = __current_kernel_time(); |
| 92 | 92 | write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); |
| 93 | 93 | } |
| @@ -313,11 +313,13 @@ clocksource_calc_mult_shift(struct clocksource *cs, u32 freq, u32 minsec) · 312 unmodified lines | ||
| 313 | 313 | |
| 314 | 314 | #ifdef CONFIG_GENERIC_TIME_VSYSCALL |
| 315 | 315 | extern void |
| 316 | −update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult); | |
| 316 | +update_vsyscall(struct timespec *ts, struct timespec *wtm, | |
| 317 | + struct clocksource *c, u32 mult); | |
| 317 | 318 | extern void update_vsyscall_tz(void); |
| 318 | 319 | #else |
| 319 | 320 | static inline void |
| 320 | −update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult) | |
| 321 | +update_vsyscall(struct timespec *ts, struct timespec *wtm, | |
| 322 | + struct clocksource *c, u32 mult) | |
| 321 | 323 | { |
| 322 | 324 | } |
| 323 | 325 | |
| @@ -170,7 +170,8 @@ void timekeeping_leap_insert(int leapsecond) · 169 unmodified lines | ||
| 170 | 170 | { |
| 171 | 171 | xtime.tv_sec += leapsecond; |
| 172 | 172 | wall_to_monotonic.tv_sec -= leapsecond; |
| 173 | − update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult); | |
| 173 | + update_vsyscall(&xtime, &wall_to_monotonic, timekeeper.clock, | |
| 174 | + timekeeper.mult); | |
| 174 | 175 | } |
| 175 | 176 | |
| 176 | 177 | /** |
| @@ -326,7 +327,8 @@ int do_settimeofday(struct timespec *tv) · 149 unmodified lines | ||
| 326 | 327 | timekeeper.ntp_error = 0; |
| 327 | 328 | ntp_clear(); |
| 328 | 329 | |
| 329 | − update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult); | |
| 330 | + update_vsyscall(&xtime, &wall_to_monotonic, timekeeper.clock, | |
| 331 | + timekeeper.mult); | |
| 330 | 332 | |
| 331 | 333 | write_sequnlock_irqrestore(&xtime_lock, flags); |
| 332 | 334 | |
| @@ -809,7 +811,8 @@ void update_wall_time(void) · 476 unmodified lines | ||
| 809 | 811 | } |
| 810 | 812 | |
| 811 | 813 | /* check to see if there is a new clocksource to use */ |
| 812 | − update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult); | |
| 814 | + update_vsyscall(&xtime, &wall_to_monotonic, timekeeper.clock, | |
| 815 | + timekeeper.mult); | |
| 813 | 816 | } |
| 814 | 817 | |
| 815 | 818 | /** |