diff options
| author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2015-01-08 16:41:47 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-02-02 14:51:32 +1100 |
| commit | fe12545e7650de5332b5522a62686fab8bafc733 (patch) | |
| tree | 2eeca6541b136f3562b499df6b457d259fd39722 /arch/powerpc/kernel/prom.c | |
| parent | a4bcbe6a41adcaa5e7f1830a7c1da8691d9d2b1d (diff) | |
| download | blackbird-op-linux-fe12545e7650de5332b5522a62686fab8bafc733.tar.gz blackbird-op-linux-fe12545e7650de5332b5522a62686fab8bafc733.zip | |
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 <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 3 |
1 files changed, 0 insertions, 3 deletions
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); |
