The patch titled m68knommu: fix invalid flags on coldfire pit clocksource has been added to the -mm tree. Its filename is m68knommu-fix-invalid-flags-on-coldfire-pit-clocksource.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: m68knommu: fix invalid flags on coldfire pit clocksource From: john stultz <johnstul@xxxxxxxxxx> The m68knommu coldfire pit clocksource looks like it was incorrectly marked as a continuous clocksource. Running with it marked as a continuous clocksource could cause hangs when the system switches to highres mode or enables nohz. This patch removes the CLOCK_SOURCE_IS_CONTINUOUS flag on the coldfire pit clocksource. This will disallow systems using this clocksource from entering oneshot mode (disabling highres timers and nohz). Signed-off-by: John Stultz <johnstul@xxxxxxxxxx> Cc: Greg Ungerer <gerg@xxxxxxxxxxxx> Cc: Steven King <sfking@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/m68knommu/platform/coldfire/pit.c | 1 - 1 file changed, 1 deletion(-) diff -puN arch/m68knommu/platform/coldfire/pit.c~m68knommu-fix-invalid-flags-on-coldfire-pit-clocksource arch/m68knommu/platform/coldfire/pit.c --- a/arch/m68knommu/platform/coldfire/pit.c~m68knommu-fix-invalid-flags-on-coldfire-pit-clocksource +++ a/arch/m68knommu/platform/coldfire/pit.c @@ -146,7 +146,6 @@ static struct clocksource pit_clk = { .read = pit_read_clk, .shift = 20, .mask = CLOCKSOURCE_MASK(32), - .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; /***************************************************************************/ _ Patches currently in -mm which might be from johnstul@xxxxxxxxxx are m68knommu-fix-invalid-flags-on-coldfire-pit-clocksource.patch convert-arm-to-arch_gettimeoffset.patch clocksource-add-argument-to-resume-callback.patch clocksource-start-cmt-at-clocksource-resume.patch clocksource-add-suspend-callback.patch convert-sparc-to-arch_gettimeoffset.patch cris-convert-to-use-arch_gettimeoffset.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