The patch titled generic: vsyscall-gtod support for GENERIC_TIME has been removed from the -mm tree. Its filename was generic-vsyscall-gtod-support-for-generic_time.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: generic: vsyscall-gtod support for GENERIC_TIME From: john stultz <johnstul@xxxxxxxxxx> Provides generic infrastructure for vsyscall-gtod. [akpm@xxxxxxxx: cleanup] Signed-off-by: John Stultz <johnstul@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/clocksource.h | 10 ++++++++++ kernel/timer.c | 1 + 2 files changed, 11 insertions(+) diff -puN include/linux/clocksource.h~generic-vsyscall-gtod-support-for-generic_time include/linux/clocksource.h --- a/include/linux/clocksource.h~generic-vsyscall-gtod-support-for-generic_time +++ a/include/linux/clocksource.h @@ -47,6 +47,7 @@ struct clocksource; * @mult: cycle to nanosecond multiplier * @shift: cycle to nanosecond divisor (power of two) * @flags: flags describing special properties + * @vread: vsyscall based read * @cycle_interval: Used internally by timekeeping core, please ignore. * @xtime_interval: Used internally by timekeeping core, please ignore. */ @@ -59,6 +60,7 @@ struct clocksource { u32 mult; u32 shift; unsigned long flags; + cycle_t (*vread)(void); /* timekeeping specific data, ignore */ cycle_t cycle_last, cycle_interval; @@ -197,4 +199,12 @@ extern int clocksource_register(struct c extern struct clocksource* clocksource_get_next(void); extern void clocksource_change_rating(struct clocksource *cs, int rating); +#ifdef CONFIG_GENERIC_TIME_VSYSCALL +extern void update_vsyscall(struct timespec *ts, struct clocksource *c); +#else +static inline void update_vsyscall(struct timespec *ts, struct clocksource *c) +{ +} +#endif + #endif /* _LINUX_CLOCKSOURCE_H */ diff -puN kernel/timer.c~generic-vsyscall-gtod-support-for-generic_time kernel/timer.c --- a/kernel/timer.c~generic-vsyscall-gtod-support-for-generic_time +++ a/kernel/timer.c @@ -1174,6 +1174,7 @@ static void update_wall_time(void) /* check to see if there is a new clocksource to use */ change_clocksource(); + update_vsyscall(&xtime, clock); } /* _ Patches currently in -mm which might be from johnstul@xxxxxxxxxx are origin.patch git-acpi.patch profile-likely-unlikely-macros-x86_64-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html