The patch titled xtensa: fix unnecessary setting of xtime has been added to the -mm tree. Its filename is xtensa-fix-unnecessary-setting-of-xtime.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: xtensa: fix unnecessary setting of xtime From: John Stultz <johnstul@xxxxxxxxxx> xtensa supports read_persisitent_clock(), so there is no reason for the arch specific code to be setting xtime. Setting xtime will be done by the generic timekeeping code. Signed-off-by: John Stultz <johnstul@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Chris Zankel <chris@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/xtensa/kernel/time.c | 5 ----- 1 file changed, 5 deletions(-) diff -puN arch/xtensa/kernel/time.c~xtensa-fix-unnecessary-setting-of-xtime arch/xtensa/kernel/time.c --- a/arch/xtensa/kernel/time.c~xtensa-fix-unnecessary-setting-of-xtime +++ a/arch/xtensa/kernel/time.c @@ -60,11 +60,6 @@ static struct irqaction timer_irqaction void __init time_init(void) { - /* FIXME: xtime&wall_to_monotonic are set in timekeeping_init. */ - read_persistent_clock(&xtime); - set_normalized_timespec(&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); - #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT printk("Calibrating CPU frequency "); platform_calibrate_ccount(); _ Patches currently in -mm which might be from johnstul@xxxxxxxxxx are origin.patch linux-next.patch arm-convert-arm-to-arch_gettimeoffset.patch cs5535-clockevt-free-timer-in-irq-setup-error-path.patch time-clean-up-warp_clock.patch time-clean-up-direct-xtime-usage-in-xen.patch genirq-warn-about-irqf_sharedirqf_disabled-at-the-right-place.patch xtensa-fix-unnecessary-setting-of-xtime.patch cris-convert-to-use-arch_gettimeoffset.patch posix-cpu-timers-cleanup-rlimits-usage.patch kernel-core-use-helpers-for-rlimits.patch time-kill-off-config_generic_time.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