diff options
author | 2006-09-25 23:32:56 -0700 | |
---|---|---|
committer | 2006-09-26 08:49:03 -0700 | |
commit | c8eb8b4025175f967af0ba8e933f23aa9954dc35 (patch) | |
tree | 1e7dcfe6472aa0cae05651e375bebb3e7b5b9eb8 /include/linux/console.h | |
parent | [PATCH] swsusp: Use memory bitmaps during resume (diff) | |
download | linux-c8eb8b4025175f967af0ba8e933f23aa9954dc35.tar.gz linux-c8eb8b4025175f967af0ba8e933f23aa9954dc35.tar.bz2 linux-c8eb8b4025175f967af0ba8e933f23aa9954dc35.zip |
[PATCH] PM: make it possible to disable console suspending
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@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Stefan Seyfried <seife@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/console.h')
-rw-r--r-- | include/linux/console.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 3bdf2155e565..76a1807726eb 100644 --- a/include/linux/console.h +++ b/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 |