@@ -759,6 +759,9 @@ void __init early_init_devtree(void *params)
*/
of_scan_flat_dt(early_init_dt_scan_chosen_ppc, boot_command_line);
+ /* Now try to figure out if we are running on LPAR and so on */
+ pseries_probe_fw_features();
+
/* Scan memory nodes and rebuild MEMBLOCKs */
of_scan_flat_dt(early_init_dt_scan_root, NULL);
of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);
@@ -826,9 +829,6 @@ void __init early_init_devtree(void *params)
#endif
epapr_paravirt_early_init();
- /* Now try to figure out if we are running on LPAR and so on */
- pseries_probe_fw_features();
-
#ifdef CONFIG_PPC_PS3
/* Identify PS3 firmware */
if (of_flat_dt_is_compatible(of_get_flat_dt_root(), "sony,ps3"))
architecture.vec5 features: The boot-time memory management needs to know the form of the "ibm,dynamic-memory-v2" property early during scanning of the flattened device tree. This patch moves execution of the function pseries_probe_fw_features() early enough to be before the scanning of the memory properties in the device tree to allow recognition of the supported properties. [V2: No change] [V3: Updated after commit 3808a88985b4f5f5e947c364debce4441a380fb8.] [V4: Update comments] [V5: Resynchronize/resubmit] [V6: Resync to v4.7 kernel code] [V7: Correct mail threading] [v8: Insert more useful variable names] Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com> --- arch/powerpc/kernel/prom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)