| Message ID | 20210512123023.3286501-1-qperret@google.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [4.14,1/2] Revert "of/fdt: Make sure no-map does not remove already reserved regions" | expand |
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 3f58812d02d9..6df66fcefbb4 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1212,16 +1212,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); }
This reverts commit 6793433fc8f263eaba1621d3724b6aeba511c6c5. It is not really a fix, and the backport misses dependencies, which breaks existing platforms. Reported-by: Alexandre TORGUE <alexandre.torgue@foss.st.com> Signed-off-by: Quentin Perret <qperret@google.com> --- drivers/of/fdt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)