git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
kernel
/
power
/
console.c
diff --git
a/kernel/power/console.c
b/kernel/power/console.c
index
00b390d
..
7ff375e
100644
(file)
--- a/
kernel/power/console.c
+++ b/
kernel/power/console.c
@@
-11,7
+11,9
@@
static int new_loglevel = 10;
static int orig_loglevel;
static int new_loglevel = 10;
static int orig_loglevel;
+#ifdef SUSPEND_CONSOLE
static int orig_fgconsole, orig_kmsg;
static int orig_fgconsole, orig_kmsg;
+#endif
int pm_prepare_console(void)
{
int pm_prepare_console(void)
{
@@
-50,6
+52,7
@@
void pm_restore_console(void)
acquire_console_sem();
set_console(orig_fgconsole);
release_console_sem();
acquire_console_sem();
set_console(orig_fgconsole);
release_console_sem();
+ kmsg_redirect = orig_kmsg;
#endif
return;
}
#endif
return;
}