A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "of/fdt: Make sure no-map does not remove already reserved regions"

Browse source 
This reverts commit 3cbd3038c9.
It is not really a fix, and the backport misses dependencies, which
breaks existing platforms.

Reported-by: Alexandre TORGUE <[email protected]>
Signed-off-by: Quentin Perret <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Quentin Perret 2021-05-12 12:28:52 +00:00 • committed by Greg Kroah-Hartman
commit 66b8853dfa
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/of/fdt.c
View file

@ -1153,16 +1153,8 @@ int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size)
int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
phys_addr_t size, bool nomap)
{
if (nomap) {
/*
* If the memory is already reserved (by another region), we
* should not allow it to be marked nomap.
*/
if (memblock_is_region_reserved(base, size))
return -EBUSY;
if (nomap)
return memblock_mark_nomap(base, size);
}
return memblock_reserve(base, size);
}