[Suspend2][ 16/21] [Suspend2] Cleanup console after suspending.

From: Nigel Cunningham
Date: Tue Jun 27 2006 - 00:49:16 EST


Close down the userspace program (if one was running) and reset logging.

Signed-off-by: Nigel Cunningham <nigel@xxxxxxxxxxxx>

kernel/power/ui.c | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/kernel/power/ui.c b/kernel/power/ui.c
index eedab56..2012c2a 100644
--- a/kernel/power/ui.c
+++ b/kernel/power/ui.c
@@ -532,3 +532,34 @@ void suspend_prepare_console(void)
return;
}

+/* suspend_cleanup_console
+ *
+ * Description: Restore the settings we saved above.
+ */
+
+void suspend_cleanup_console(void)
+{
+ suspend_default_console_level = console_loglevel;
+
+ if (ui_helper_data.pid > -1) {
+ struct task_struct *t;
+
+ suspend_send_netlink_message(&ui_helper_data,
+ NETLINK_MSG_CLEANUP, NULL, 0);
+
+ read_lock(&tasklist_lock);
+ if ((t = find_task_by_pid(ui_helper_data.pid)))
+ t->flags &= ~PF_NOFREEZE;
+ read_unlock(&tasklist_lock);
+
+ suspend_netlink_close(&ui_helper_data);
+
+ ui_helper_data.pid = -1;
+ }
+
+ console_loglevel = orig_loglevel;
+ kmsg_redirect = orig_kmsg;
+ default_message_loglevel = orig_default_message_loglevel;
+}
+#endif
+

--
Nigel Cunningham nigel at suspend2 dot net
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/