From: Gavin Shan Date: Thu, 8 Jan 2015 05:41:47 +0000 (+1100) Subject: powerpc/kernel: Avoid initializing device-tree pointer twice X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fe12545e7650de5332b5522a62686fab8bafc733;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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: Gavin Shan Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 6a799b3cc6b4..b8e15c678960 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -652,9 +652,6 @@ void __init early_init_devtree(void *params) if (!early_init_dt_verify(params)) panic("BUG: Failed verifying flat device tree, bad version?"); - /* Setup flat device-tree pointer */ - initial_boot_params = params; - #ifdef CONFIG_PPC_RTAS /* Some machines might need RTAS info for debugging, grab it now. */ of_scan_flat_dt(early_init_dt_scan_rtas, NULL);