The patch titled
PM: make it possible to disable console suspending
has been removed from the -mm tree. Its filename is
pm-make-it-possible-to-disable-console-suspending.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: PM: make it possible to disable console suspending
From: "Rafael J. Wysocki" <rjw@xxxxxxx>
Change suspend_console() so that it waits for all consoles to flush the
remaining messages and make it possible to switch the console suspending off
with the help of a Kconfig option.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Cc: Stefan Seyfried <seife@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/console.h | 5 +++++
kernel/power/Kconfig | 11 +++++++++++
kernel/printk.c | 3 +++
3 files changed, 19 insertions(+)
diff -puN include/linux/console.h~pm-make-it-possible-to-disable-console-suspending include/linux/console.h
--- a/include/linux/console.h~pm-make-it-possible-to-disable-console-suspending
+++ a/include/linux/console.h
@@ -120,9 +120,14 @@ extern void console_stop(struct console
extern void console_start(struct console *);
extern int is_console_locked(void);
+#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
/* Suspend and resume console messages over PM events */
extern void suspend_console(void);
extern void resume_console(void);
+#else
+static inline void suspend_console(void) {}
+static inline void resume_console(void) {}
+#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
/* Some debug stub to catch some of the obvious races in the VT code */
#if 1
diff -puN kernel/power/Kconfig~pm-make-it-possible-to-disable-console-suspending kernel/power/Kconfig
--- a/kernel/power/Kconfig~pm-make-it-possible-to-disable-console-suspending
+++ a/kernel/power/Kconfig
@@ -36,6 +36,17 @@ config PM_DEBUG
code. This is helpful when debugging and reporting various PM bugs,
like suspend support.
+config DISABLE_CONSOLE_SUSPEND
+ bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
+ depends on PM && PM_DEBUG
+ default n
+ ---help---
+ This option turns off the console suspend mechanism that prevents
+ debug messages from reaching the console during the suspend/resume
+ operations. This may be helpful when debugging device drivers'
+ suspend/resume routines, but may itself lead to problems, for example
+ if netconsole is used.
+
config PM_TRACE
bool "Suspend/resume event tracing"
depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL
diff -puN kernel/printk.c~pm-make-it-possible-to-disable-console-suspending kernel/printk.c
--- a/kernel/printk.c~pm-make-it-possible-to-disable-console-suspending
+++ a/kernel/printk.c
@@ -721,6 +721,7 @@ int __init add_preferred_console(char *n
return 0;
}
+#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
/**
* suspend_console - suspend the console subsystem
*
@@ -728,6 +729,7 @@ int __init add_preferred_console(char *n
*/
void suspend_console(void)
{
+ printk("Suspending console(s)\n");
acquire_console_sem();
console_suspended = 1;
}
@@ -737,6 +739,7 @@ void resume_console(void)
console_suspended = 0;
release_console_sem();
}
+#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
/**
* acquire_console_sem - lock the console system for exclusive use.
_
Patches currently in -mm which might be from rjw@xxxxxxx are
origin.patch
usb-allow-both-root-hub-interrupts-and-polling.patch
ohci-remove-existing-autosuspend-code.patch
ohci-add-auto-stop-support.patch
uswsusp-add-pmops-prepareenterfinish-support-aka-platform-mode.patch
swsusp-use-suspend_console.patch
reiserfs-make-sure-all-dentries-refs-are-released-before-calling-kill_block_super-try-2.patch
ide-reprogram-disk-pio-timings-on-resume.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
