diff options
Diffstat (limited to 'kernel/power/console.c')
| -rw-r--r-- | kernel/power/console.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index 5187136fe1de..218e5af90156 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/vt_kern.h> | 7 | #include <linux/vt_kern.h> |
| 8 | #include <linux/kbd_kern.h> | 8 | #include <linux/kbd_kern.h> |
| 9 | #include <linux/console.h> | 9 | #include <linux/vt.h> |
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include "power.h" | 11 | #include "power.h" |
| 12 | 12 | ||
| @@ -21,8 +21,7 @@ int pm_prepare_console(void) | |||
| 21 | if (orig_fgconsole < 0) | 21 | if (orig_fgconsole < 0) |
| 22 | return 1; | 22 | return 1; |
| 23 | 23 | ||
| 24 | orig_kmsg = kmsg_redirect; | 24 | orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE); |
| 25 | kmsg_redirect = SUSPEND_CONSOLE; | ||
| 26 | return 0; | 25 | return 0; |
| 27 | } | 26 | } |
| 28 | 27 | ||
| @@ -30,7 +29,7 @@ void pm_restore_console(void) | |||
| 30 | { | 29 | { |
| 31 | if (orig_fgconsole >= 0) { | 30 | if (orig_fgconsole >= 0) { |
| 32 | vt_move_to_console(orig_fgconsole, 0); | 31 | vt_move_to_console(orig_fgconsole, 0); |
| 33 | kmsg_redirect = orig_kmsg; | 32 | vt_kmsg_redirect(orig_kmsg); |
| 34 | } | 33 | } |
| 35 | } | 34 | } |
| 36 | #endif | 35 | #endif |
