The patch titled um: fix global timer issue when using CONFIG_NO_HZ has been added to the -mm tree. Its filename is um-fix-global-timer-issue-when-using-config_no_hz.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: um: fix global timer issue when using CONFIG_NO_HZ From: Richard Weinberger <richard@xxxxxx> This fixes a issue which was introduced by fe2cc53e ("uml: track and make up lost ticks"). timeval_to_ns() returns long long and not int. Due to that UML's timer did not work properlt and caused timer freezes. Signed-off-by: Richard Weinberger <richard@xxxxxx> Acked-by: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Cc: <stable@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/os-Linux/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/um/os-Linux/time.c~um-fix-global-timer-issue-when-using-config_no_hz arch/um/os-Linux/time.c --- a/arch/um/os-Linux/time.c~um-fix-global-timer-issue-when-using-config_no_hz +++ a/arch/um/os-Linux/time.c @@ -60,7 +60,7 @@ static inline long long timeval_to_ns(co long long disable_timer(void) { struct itimerval time = ((struct itimerval) { { 0, 0 }, { 0, 0 } }); - int remain, max = UM_NSEC_PER_SEC / UM_HZ; + long long remain, max = UM_NSEC_PER_SEC / UM_HZ; if (setitimer(ITIMER_VIRTUAL, &time, &time) < 0) printk(UM_KERN_ERR "disable_timer - setitimer failed, " _ Patches currently in -mm which might be from richard@xxxxxx are origin.patch hostfs-fix-uml-crash.patch um-migrate-from-__do_irq-to-generic_handle_irq.patch um-fix-global-timer-issue-when-using-config_no_hz.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