Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365674
b: refs/heads/master
c: c2409b0
h: refs/heads/master
v: v3
  • Loading branch information
Richard Weinberger authored and Linus Torvalds committed Apr 30, 2013
1 parent d588777 commit 04bd549
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f91eb62f71b31e69e405663ff8d047bc3b9f7525
refs/heads/master: c2409b004ac4757ac5121851f8a58e0bcbcf7a3c
6 changes: 3 additions & 3 deletions trunk/init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ static int __ref kernel_init(void *unused)
if (ramdisk_execute_command) {
if (!run_init_process(ramdisk_execute_command))
return 0;
printk(KERN_WARNING "Failed to execute %s\n",
printk(KERN_ERR "Failed to execute %s\n",
ramdisk_execute_command);
}

Expand All @@ -838,7 +838,7 @@ static int __ref kernel_init(void *unused)
if (execute_command) {
if (!run_init_process(execute_command))
return 0;
printk(KERN_WARNING "Failed to execute %s. Attempting "
printk(KERN_ERR "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
if (!run_init_process("/sbin/init") ||
Expand Down Expand Up @@ -884,7 +884,7 @@ static noinline void __init kernel_init_freeable(void)

/* Open the /dev/console on the rootfs, this should never fail */
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
printk(KERN_WARNING "Warning: unable to open an initial console.\n");
printk(KERN_ERR "Warning: unable to open an initial console.\n");

(void) sys_dup(0);
(void) sys_dup(0);
Expand Down

0 comments on commit 04bd549

Please sign in to comment.