The patch titled Subject: watchdog: fix for lockup detector breakage on resume has been removed from the -mm tree. Its filename was nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2.patch This patch was dropped because it was folded into nmi-watchdog-fix-for-lockup-detector-breakage-on-resume.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Sameer Nanda <snanda@xxxxxxxxxxxx> Subject: watchdog: fix for lockup detector breakage on resume Signed-off-by: Sameer Nanda <snanda@xxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Don Zickus <dzickus@xxxxxxxxxx> Cc: Mandeep Singh Baines <msb@xxxxxxxxxxxx> Cc: Srivatsa S. Bhat <srivatsa.bhat@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/watchdog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN kernel/watchdog.c~nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2 kernel/watchdog.c --- a/kernel/watchdog.c~nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2 +++ a/kernel/watchdog.c @@ -608,8 +608,9 @@ void lockup_detector_bootcpu_resume(void { void *cpu = (void *)(long)smp_processor_id(); - cpu_callback(&cpu_nfb, CPU_DEAD, cpu); - cpu_callback(&cpu_nfb, CPU_ONLINE, cpu); + cpu_callback(&cpu_nfb, CPU_DEAD_FROZEN, cpu); + cpu_callback(&cpu_nfb, CPU_UP_PREPARE_FROZEN, cpu); + cpu_callback(&cpu_nfb, CPU_ONLINE_FROZEN, cpu); } #endif _ 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-v2-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