Commit fe12545e authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman

powerpc/kernel: Avoid initializing device-tree pointer twice

As commit 50ba08f3 ("of/fdt: Don't clear initial_boot_params
if fdt_check_header() fails") does, the device-tree pointer
"initial_boot_params" is initialized by early_init_dt_verify(),
which is called by early_init_devtree(). So we needn't explicitly
initialize that again in early_init_devtree().
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a4bcbe6a
...@@ -652,9 +652,6 @@ void __init early_init_devtree(void *params) ...@@ -652,9 +652,6 @@ void __init early_init_devtree(void *params)
if (!early_init_dt_verify(params)) if (!early_init_dt_verify(params))
panic("BUG: Failed verifying flat device tree, bad version?"); panic("BUG: Failed verifying flat device tree, bad version?");
/* Setup flat device-tree pointer */
initial_boot_params = params;
#ifdef CONFIG_PPC_RTAS #ifdef CONFIG_PPC_RTAS
/* Some machines might need RTAS info for debugging, grab it now. */ /* Some machines might need RTAS info for debugging, grab it now. */
of_scan_flat_dt(early_init_dt_scan_rtas, NULL); of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment