The patch titled Subject: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix has been added to the -mm tree. Its filename is nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Sameer Nanda <snanda@xxxxxxxxxxxx> Subject: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix tweak comment further Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Don Zickus <dzickus@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Mandeep Singh Baines <msb@xxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Sameer Nanda <snanda@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/watchdog.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN kernel/watchdog.c~nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix kernel/watchdog.c --- a/kernel/watchdog.c~nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix +++ a/kernel/watchdog.c @@ -598,9 +598,10 @@ static struct notifier_block __cpuinitda }; /* - * On entry to suspend we force an offline->online transition on the boot CPU so - * that PMU state is available to that CPU when it comes back online after - * resume. This information is required for restarting the NMI watchdog. + * On exit from suspend we force an offline->online transition on the boot CPU + * so that the PMU state that was lost while in suspended state gets set up + * properly for the boot CPU. This information is required for restarting the + * NMI watchdog. */ void lockup_detector_bootcpu_resume(void) { _ Subject: Subject: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix Patches currently in -mm which might be from snanda@xxxxxxxxxxxx are nmi-watchdog-fix-for-lockup-detector-breakage-on-resume.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-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