diff options
author | liguang <lig.fnst@cn.fujitsu.com> | 2013-07-03 18:05:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:41 -0400 |
commit | 7ec75e1ca1bd35872a5c7b33da4b05395bc74364 (patch) | |
tree | 0d3386535e7f93cfdd7fff721eeb5a1a6826063d /kernel/sys.c | |
parent | b58d977432c80ee60d6970042775a62e3f8d7675 (diff) |
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>
Diffstat (limited to 'kernel/sys.c')
-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, | |||
511 | case LINUX_REBOOT_CMD_HALT: | 511 | case LINUX_REBOOT_CMD_HALT: |
512 | kernel_halt(); | 512 | kernel_halt(); |
513 | do_exit(0); | 513 | do_exit(0); |
514 | panic("cannot halt"); | 514 | panic("cannot halt.\n"); |
515 | 515 | ||
516 | case LINUX_REBOOT_CMD_POWER_OFF: | 516 | case LINUX_REBOOT_CMD_POWER_OFF: |
517 | kernel_power_off(); | 517 | kernel_power_off(); |