diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2017-05-07 10:39:03 -0700 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2017-05-07 10:39:03 -0700 |
| commit | 2a4e669dd611855d89d938063c10f44cb67ce65d (patch) | |
| tree | d40467ef42c71879339c11063e74155bc2f2c628 /arch/xtensa/kernel/setup.c | |
| parent | 062b1c19b879e7831cbceb599ab1d758f87eda40 (diff) | |
| parent | fbe22d280014e783fe2454db2a0ba44fc4f68a5a (diff) | |
| download | linux-stable-2a4e669dd611855d89d938063c10f44cb67ce65d.tar.gz linux-stable-2a4e669dd611855d89d938063c10f44cb67ce65d.tar.bz2 linux-stable-2a4e669dd611855d89d938063c10f44cb67ce65d.zip | |
Merge branch 'xtensa-sim-params' into xtensa-fixes
Diffstat (limited to 'arch/xtensa/kernel/setup.c')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index fd33920e1a19..394ef08300b6 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -317,8 +317,9 @@ static inline int mem_reserve(unsigned long start, unsigned long end) void __init setup_arch(char **cmdline_p) { - strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; + platform_setup(cmdline_p); + strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE); /* Reserve some memory regions */ @@ -382,8 +383,6 @@ void __init setup_arch(char **cmdline_p) unflatten_and_copy_device_tree(); - platform_setup(cmdline_p); - #ifdef CONFIG_SMP smp_init_cpus(); #endif |