From: liguang <lig.fnst@cn.fujitsu.com>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
David Howells <dhowells@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>,
Dave Jones <davej@redhat.com>, Kees Cook <keescook@chromium.org>,
Cyrill Gorcunov <gorcunov@openvz.org>,
Al Viro <viro@zeniv.linux.org.uk>,
liguang <lig.fnst@cn.fujitsu.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] sys: fix malformed panic massage of reboot
Date: Thu, 30 May 2013 15:58:06 +0800 [thread overview]
Message-ID: <1369900686-5936-4-git-send-email-lig.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1369900686-5936-1-git-send-email-lig.fnst@cn.fujitsu.com>
if LINUX_REBOOT_CMD_HALT for reboot failed,
message "cannot halt" will stay in same line
with next message, so append a '\n' for it.
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
kernel/sys.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sys.c b/kernel/sys.c
index 6dabfc1..c04c611 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -486,7 +486,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
system_state = SYSTEM_HALT;
kernel_halt();
do_exit(0);
- panic("cannot halt");
+ panic("cannot halt.\n");
case LINUX_REBOOT_CMD_POWER_OFF:
system_state = SYSTEM_POWER_OFF;
--
1.7.2.5
next prev parent reply other threads:[~2013-05-30 7:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 7:58 [PATCH 1/4] sys: remove unnecesscary parameter of set_one_prio liguang
2013-05-30 7:58 ` [PATCH 2/4] sys: remove kernel_shutdown_prepare's parameter liguang
2013-05-31 22:58 ` Andrew Morton
2013-05-30 7:58 ` [PATCH 3/4] sys/reboot: boolize C_A_D liguang
2013-05-31 23:02 ` Andrew Morton
2013-06-03 0:25 ` li guang
2013-06-03 1:09 ` Joe Perches
2013-05-30 7:58 ` liguang [this message]
2013-05-30 8:08 ` [PATCH 1/4] sys: remove unnecesscary parameter of set_one_prio Joe Perches
2013-05-31 23:07 ` Andrew Morton
2013-05-31 22:53 ` Andrew Morton
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=1369900686-5936-4-git-send-email-lig.fnst@cn.fujitsu.com \
--to=lig.fnst@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=davej@redhat.com \
--cc=dhowells@redhat.com \
--cc=gorcunov@openvz.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtk.manpages@gmail.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/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
all inboxes | Powered by JetHome®