luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixes

Browse Source
This commit is contained in:
Rob Herring 2013-12-30 12:09:47 -06:00
commit f0082e3cf7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/of/fdt.c
View File

@ -922,8 +922,16 @@ void __init unflatten_device_tree(void)
*/ */
void __init unflatten_and_copy_device_tree(void) void __init unflatten_and_copy_device_tree(void)
{ {
int size = __be32_to_cpu(initial_boot_params->totalsize); int size;
void *dt = early_init_dt_alloc_memory_arch(size, void *dt;
if (!initial_boot_params) {
pr_warn("No valid device tree found, continuing without\n");
return;
}
size = __be32_to_cpu(initial_boot_params->totalsize);
dt = early_init_dt_alloc_memory_arch(size,
__alignof__(struct boot_param_header)); __alignof__(struct boot_param_header));
if (dt) { if (dt) {