powerpc/kernel: Avoid initializing device-tree pointer twice
authorGavin Shan <gwshan@linux.vnet.ibm.com>
Thu, 8 Jan 2015 05:41:47 +0000 (16:41 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 2 Feb 2015 03:51:32 +0000 (14:51 +1100)
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 <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/prom.c

index 6a799b3cc6b444b0900e06d7bf0a2a7c6fd801b3..b8e15c678960f3aadc5094860b9c1742c942e3d3 100644 (file)
@@ -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);