The patch titled pm: wait for console in resume has been added to the -mm tree. Its filename is pm-wait-for-console-in-resume.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: pm: wait for console in resume From: Arve Hjønnevåg <arve@xxxxxxxxxxx> Avoids later waking up to a blinking cursor if the device woke up and returned to sleep before the console switch happened. Signed-off-by: Brian Swetland <swetland@xxxxxxxxxx> Signed-off-by: Arve Hjønnevåg <arve@xxxxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/power/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN kernel/power/console.c~pm-wait-for-console-in-resume kernel/power/console.c --- a/kernel/power/console.c~pm-wait-for-console-in-resume +++ a/kernel/power/console.c @@ -78,6 +78,12 @@ void pm_restore_console(void) } set_console(orig_fgconsole); release_console_sem(); + + if (vt_waitactive(orig_fgconsole)) { + pr_debug("Resume: Can't switch VCs."); + return; + } + kmsg_redirect = orig_kmsg; } #endif _ Patches currently in -mm which might be from arve@xxxxxxxxxxx are origin.patch pm-wait-for-console-in-resume.patch pm-fix-suspend_console-resume_console-to-use-only-one-semaphore.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