diff options
author | liguang <lig.fnst@cn.fujitsu.com> | 2013-07-03 15:05:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 16:07:41 -0700 |
commit | 7ec75e1ca1bd35872a5c7b33da4b05395bc74364 (patch) | |
tree | 0d3386535e7f93cfdd7fff721eeb5a1a6826063d | |
parent | b58d977432c80ee60d6970042775a62e3f8d7675 (diff) | |
download | linux-stable-7ec75e1ca1bd35872a5c7b33da4b05395bc74364.tar.gz linux-stable-7ec75e1ca1bd35872a5c7b33da4b05395bc74364.tar.bz2 linux-stable-7ec75e1ca1bd35872a5c7b33da4b05395bc74364.zip |
kernel/sys.c: sys_reboot(): fix malformed panic message
If LINUX_REBOOT_CMD_HALT for reboot failed, the message "cannot halt" will
stay on the same line with the next message, so append a '\n'.
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 2bbd9a73b54c..c1da757a97b0 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -511,7 +511,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, case LINUX_REBOOT_CMD_HALT: kernel_halt(); do_exit(0); - panic("cannot halt"); + panic("cannot halt.\n"); case LINUX_REBOOT_CMD_POWER_OFF: kernel_power_off(); |