projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...
[firefly-linux-kernel-4.4.55.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index 800a0daede7e4d8b8940288bd30dfb43a6e922a8..321d0ceb26d3782ed6871feef4c52090e9872b23 100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-544,7
+544,7
@@
asmlinkage __visible void __init start_kernel(void)
static_command_line, __start___param,
__stop___param - __start___param,
-1, -1, &unknown_bootoption);
static_command_line, __start___param,
__stop___param - __start___param,
-1, -1, &unknown_bootoption);
- if (
after_dashes
)
+ if (
!IS_ERR_OR_NULL(after_dashes)
)
parse_args("Setting init args", after_dashes, NULL, 0, -1, -1,
set_init_arg);
parse_args("Setting init args", after_dashes, NULL, 0, -1, -1,
set_init_arg);