diff options
| author | Ian Campbell <icampbell@arcom.com> | 2004-10-09 01:03:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-09 01:03:26 -0700 |
| commit | b959d48e8272523cb004120e703e5f21c26a3edb (patch) | |
| tree | ec98f35a3029a5d6067792ac1c965520b29baa80 /kernel | |
| parent | 4279a3c3f81d9720f13cbc1f3c1e24a7ac5a3e04 (diff) | |
[PATCH] pm: console driver fixes
Fix warnings in kernel/power/console.c by only declaring orig_fgconsole
and orig_kmsg when required by SUSPEND_CONSOLE. Restore kmsg_redirect on
resume.
Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/console.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index 00b390d7a5ad..7ff375e7c95f 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c @@ -11,7 +11,9 @@ static int new_loglevel = 10; static int orig_loglevel; +#ifdef SUSPEND_CONSOLE static int orig_fgconsole, orig_kmsg; +#endif int pm_prepare_console(void) { @@ -50,6 +52,7 @@ void pm_restore_console(void) acquire_console_sem(); set_console(orig_fgconsole); release_console_sem(); + kmsg_redirect = orig_kmsg; #endif return; } |