From: Ian Campbell <icampbell@arcom.com>
To: Andrew Morton <akpm@osdl.org>
Cc: Linus Torvalds <torvalds@osdl.org>,
linux-kernel@vger.kernel.org, trivial@rustcorp.com.au,
Patrick Mochel <mochel@digitalimplant.org>,
Pavel Machek <pavel@ucw.cz>
Subject: Re: [PATCH] trivial fix for warning in kernel/power/console.c
Date: Fri, 08 Oct 2004 09:07:13 +0100 [thread overview]
Message-ID: <1097222833.5231.67.camel@icampbell-debian> (raw)
In-Reply-To: <20041007160858.0708e968.akpm@osdl.org>
> Not only that, orig_kmsg is assigned to but never read from.
I decided to restore it rather that dump it, so how about:
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>
Index: 2.6-bk/kernel/power/console.c
===================================================================
--- 2.6-bk.orig/kernel/power/console.c 2004-10-07 14:47:25.000000000 +0100
+++ 2.6-bk/kernel/power/console.c 2004-10-08 08:56:28.750936142 +0100
@@ -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 @@
acquire_console_sem();
set_console(orig_fgconsole);
release_console_sem();
+ kmsg_redirect = orig_kmsg;
#endif
return;
}
--
Ian Campbell, Senior Design Engineer
Web: http://www.arcom.com
Arcom, Clifton Road, Direct: +44 (0)1223 403 465
Cambridge CB1 7EA, United Kingdom Phone: +44 (0)1223 411 200
_____________________________________________________________________
The message in this transmission is sent in confidence for the attention of the addressee only and should not be disclosed to any other party. Unauthorised recipients are requested to preserve this confidentiality. Please advise the sender if the addressee is not resident at the receiving end. Email to and from Arcom is automatically monitored for operational and lawful business reasons.
This message has been virus scanned by MessageLabs.
prev parent reply other threads:[~2004-10-08 8:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-07 14:04 Ian Campbell
2004-10-07 23:08 ` Andrew Morton
2004-10-08 8:07 ` Ian Campbell [this message]
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=1097222833.5231.67.camel@icampbell-debian \
--to=icampbell@arcom.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mochel@digitalimplant.org \
--cc=pavel@ucw.cz \
--cc=torvalds@osdl.org \
--cc=trivial@rustcorp.com.au \
/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