]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
kernel/sys.c: sys_reboot(): fix malformed panic message
authorliguang <lig.fnst@cn.fujitsu.com>
Wed, 3 Jul 2013 22:05:00 +0000 (15:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 23:07:41 +0000 (16:07 -0700)
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>
kernel/sys.c

index 2bbd9a73b54c27b0e75eb651d931f0987ff870ed..c1da757a97b0da35c623f0fff911c12b0e43ea54 100644 (file)
@@ -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();