--- git/kernel/power/Kconfig-o	2009-03-03 01:34:28.000000000 +0100
+++ git/kernel/power/Kconfig	2009-03-03 01:34:10.000000000 +0100
@@ -61,6 +61,17 @@
 	CAUTION: this option will cause your machine's real-time clock to be
 	set to an invalid time after a resume.
 
+config PM_SUSPEND_CONSOLE
+	bool "Switch to a virtual console upon suspend"
+	default y
+	---help---
+	If console on virtual terminal support is available then the kernel
+	will switch to a free virtual terminal upon suspend and return to
+	the current virtual terminal after resume.
+	This might make some suspend debug or error output visible to the
+	user but might incur the additional delay of VT switch and probably
+	also switch away from a running GUI on the framebuffer etc.
+
 config PM_SLEEP_SMP
 	bool
 	depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
--- git/kernel/power/console.c-o	2009-03-03 01:34:47.000000000 +0100
+++ git/kernel/power/console.c	2009-03-03 01:26:55.000000000 +0100
@@ -20,12 +20,17 @@
 
 	orig_fgconsole = fg_console;
 
+#if defined(CONFIG_PM_SUSPEND_CONSOLE)
 	if (vc_allocate(SUSPEND_CONSOLE)) {
 	  /* we can't have a free VC for now. Too bad,
 	   * we don't want to mess the screen for now. */
 		release_console_sem();
 		return 1;
 	}
+#else
+	release_console_sem();
+	return 1;
+#endif
 
 	if (set_console(SUSPEND_CONSOLE)) {
 		/*