mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
44347d947f
1603 changed files with 32864 additions and 29590 deletions
|
|
@ -492,6 +492,11 @@ static int __init do_early_param(char *param, char *val)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void __init parse_early_options(char *cmdline)
|
||||
{
|
||||
parse_args("early options", cmdline, NULL, 0, do_early_param);
|
||||
}
|
||||
|
||||
/* Arch code calls this early on, or if not, just before other parsing. */
|
||||
void __init parse_early_param(void)
|
||||
{
|
||||
|
|
@ -503,7 +508,7 @@ void __init parse_early_param(void)
|
|||
|
||||
/* All fall through to do_early_param. */
|
||||
strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
|
||||
parse_args("early options", tmp_cmdline, NULL, 0, do_early_param);
|
||||
parse_early_options(tmp_cmdline);
|
||||
done = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue