The patch titled generic-vsyscall-gtod-support-for-generic_time-tidy has been removed from the -mm tree. Its filename was generic-vsyscall-gtod-support-for-generic_time-tidy.patch This patch was dropped because it was folded into generic-vsyscall-gtod-support-for-generic_time.patch ------------------------------------------------------ Subject: generic-vsyscall-gtod-support-for-generic_time-tidy From: Andrew Morton <akpm@xxxxxxxx> it's a losing battle. Cc: 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@xxxxxxxx> --- include/linux/clocksource.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: linux-2.6.20-rc6-mm/include/linux/clocksource.h =================================================================== --- linux-2.6.20-rc6-mm.orig/include/linux/clocksource.h +++ linux-2.6.20-rc6-mm/include/linux/clocksource.h @@ -202,7 +202,9 @@ extern void clocksource_change_rating(st #ifdef CONFIG_GENERIC_TIME_VSYSCALL extern void update_vsyscall(struct timespec *ts, struct clocksource *c); #else -#define update_vsyscall(now, c) do { } while(0) +static inline void update_vsyscall(struct timespec *ts, struct clocksource *c) +{ +} #endif #endif /* _LINUX_CLOCKSOURCE_H */ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch vmi-versus-hrtimers.patch add-a-functions-to-handle-interrupt-affinity-setting.patch i386-use-gtod-persistent-clock-support.patch hrtimers-namespace-and-enum-cleanup.patch hrtimers-cleanup-locking.patch hrtimers-add-state-tracking.patch clockevents-i383-drivers.patch generic-vsyscall-gtod-support-for-generic_time.patch generic-vsyscall-gtod-support-for-generic_time-tidy.patch revert-x86_64-mm-ignore-long-smi-interrupts-in-clock-calibration.patch time-x86_64-split-x86_64-kernel-timec-up-tidy.patch time-x86_64-split-x86_64-kernel-timec-up-fix.patch reapply-x86_64-mm-ignore-long-smi-interrupts-in-clock-calibration.patch time-x86_64-convert-x86_64-to-use-generic_time-fix.patch time-x86_64-convert-x86_64-to-use-generic_time-tidy.patch time-x86_64-re-enable-vsyscall-support-for-x86_64-tidy.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