Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / kernel / prom.c

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 00fdea24f8549b04b76682c1501dd8f15afe55af..8b888b12a4752a907bfbd5f34afbf0b80f870a98 100644 (file)
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -572,6 +572,7 @@ static void __init early_reserve_mem_dt(void)
        int len;
        const __be32 *prop;
 
+       early_init_fdt_reserve_self();
        early_init_fdt_scan_reserved_mem();
 
        dt_root = of_get_flat_dt_root();
@@ -799,6 +800,7 @@ int of_get_ibm_chip_id(struct device_node *np)
        }
        return -1;
 }
+EXPORT_SYMBOL(of_get_ibm_chip_id);
 
 /**
  * cpu_to_chip_id - Return the cpus chip-id