File tree Expand file tree Collapse file tree 1 file changed +14
-12
lines changed Expand file tree Collapse file tree 1 file changed +14
-12
lines changed Original file line number Diff line number Diff line change @@ -283,22 +283,24 @@ void __init x86_flattree_get_config(void)
283
283
u32 size , map_len ;
284
284
void * dt ;
285
285
286
- if (!initial_dtb )
287
- return ;
288
-
289
- map_len = max (PAGE_SIZE - (initial_dtb & ~PAGE_MASK ), (u64 )128 );
286
+ if (initial_dtb ) {
287
+ map_len = max (PAGE_SIZE - (initial_dtb & ~PAGE_MASK ), (u64 )128 );
288
+
289
+ dt = early_memremap (initial_dtb , map_len );
290
+ size = fdt_totalsize (dt );
291
+ if (map_len < size ) {
292
+ early_memunmap (dt , map_len );
293
+ dt = early_memremap (initial_dtb , size );
294
+ map_len = size ;
295
+ }
290
296
291
- dt = early_memremap (initial_dtb , map_len );
292
- size = fdt_totalsize (dt );
293
- if (map_len < size ) {
294
- early_memunmap (dt , map_len );
295
- dt = early_memremap (initial_dtb , size );
296
- map_len = size ;
297
+ early_init_dt_verify (dt );
297
298
}
298
299
299
- early_init_dt_verify (dt );
300
300
unflatten_and_copy_device_tree ();
301
- early_memunmap (dt , map_len );
301
+
302
+ if (initial_dtb )
303
+ early_memunmap (dt , map_len );
302
304
}
303
305
#endif
304
306
You can’t perform that action at this time.
0 commit comments