diff --git a/[refs] b/[refs] index 529ac6e803c5..d97bf0b996d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc32781bfdb56dad883469b65e468e749ef35fe5 +refs/heads/master: eab6a08c082b82dff884eb49a2229b0474d0b7e5 diff --git a/trunk/arch/arc/include/asm/mach_desc.h b/trunk/arch/arc/include/asm/mach_desc.h index eaebaf835f85..9998dc846ebb 100644 --- a/trunk/arch/arc/include/asm/mach_desc.h +++ b/trunk/arch/arc/include/asm/mach_desc.h @@ -82,4 +82,6 @@ __attribute__((__section__(".arch.info.init"))) = { \ }; extern struct machine_desc *setup_machine_fdt(void *dt); +extern void __init copy_devtree(void); + #endif diff --git a/trunk/arch/arc/kernel/devtree.c b/trunk/arch/arc/kernel/devtree.c index a7d98b30358b..bdee3a812052 100644 --- a/trunk/arch/arc/kernel/devtree.c +++ b/trunk/arch/arc/kernel/devtree.c @@ -106,3 +106,18 @@ struct machine_desc * __init setup_machine_fdt(void *dt) return mdesc_best; } + +/* + * Copy the flattened DT out of .init since unflattening doesn't copy strings + * and the normal DT APIs refs them from orig flat DT + */ +void __init copy_devtree(void) +{ + void *alloc = early_init_dt_alloc_memory_arch( + be32_to_cpu(initial_boot_params->totalsize), 64); + if (alloc) { + memcpy(alloc, initial_boot_params, + be32_to_cpu(initial_boot_params->totalsize)); + initial_boot_params = alloc; + } +} diff --git a/trunk/arch/arc/kernel/setup.c b/trunk/arch/arc/kernel/setup.c index e591c6ae88a6..dc0f968dae0a 100644 --- a/trunk/arch/arc/kernel/setup.c +++ b/trunk/arch/arc/kernel/setup.c @@ -354,6 +354,8 @@ void __init setup_arch(char **cmdline_p) setup_arch_memory(); + /* copy flat DT out of .init and then unflatten it */ + copy_devtree(); unflatten_device_tree(); /* Can be issue if someone passes cmd line arg "ro"