mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nigel Cunningham <nigel@suspend2.net>
To: linux-kernel@vger.kernel.org
Subject: [Suspend2][ 16/21] [Suspend2] Cleanup console after suspending.
Date: Tue, 27 Jun 2006 14:42:07 +1000	[thread overview]
Message-ID: <20060627044206.14883.60157.stgit@nigel.suspend2.net> (raw)
In-Reply-To: <20060627044112.14883.55823.stgit@nigel.suspend2.net>

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

Signed-off-by: Nigel Cunningham <nigel@suspend2.net>

 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

  parent reply	other threads:[~2006-06-27  4:48 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-27  4:41 [Suspend2][ 00/21] User interface Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 01/21] [Suspend2] User interface c header Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 02/21] [Suspend2] Modify action state Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 03/21] [Suspend2] Tell userspace to redraw the screen Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 04/21] [Suspend2] Process abort request Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 05/21] [Suspend2] Receive a message from the userui Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 06/21] [Suspend2] Get userui storage needed Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 07/21] [Suspend2] Serialise userui configuration info Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 08/21] [Suspend2] Get amount of memory needed for userui Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 09/21] [Suspend2] Update progress bar Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 10/21] [Suspend2] __suspend_message Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 11/21] [Suspend2] Wait for keypress Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 12/21] [Suspend2] Abort a cycle Nigel Cunningham
2006-06-27  4:41 ` [Suspend2][ 13/21] [Suspend2] Main message output Nigel Cunningham
2006-06-27  4:42 ` [Suspend2][ 14/21] [Suspend2] Conditionally pause Nigel Cunningham
2006-06-27  4:42 ` [Suspend2][ 15/21] [Suspend2] Prepare ui for work Nigel Cunningham
2006-06-27  4:42 ` Nigel Cunningham [this message]
2006-06-27  4:42 ` [Suspend2][ 17/21] [Suspend2] Early boot message support Nigel Cunningham
2006-06-27  4:42 ` [Suspend2][ 18/21] [Suspend2] Userspace proc entries Nigel Cunningham
2006-06-27  4:42 ` [Suspend2][ 19/21] [Suspend2] Operations for userspace interface module Nigel Cunningham
2006-06-27  4:42 ` [Suspend2][ 20/21] [Suspend2] Load time initialisation for user interface code Nigel Cunningham
2006-06-27  4:42 ` [Suspend2][ 21/21] [Suspend2] kernel/power/ui.h Nigel Cunningham

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060627044206.14883.60157.stgit@nigel.suspend2.net \
    --to=nigel@suspend2.net \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome