| Message ID | 20210512123023.3286501-2-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 6df66fcefbb4..6337c394bfe3 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1213,7 +1213,7 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { if (nomap) - return memblock_mark_nomap(base, size); + return memblock_remove(base, size); return memblock_reserve(base, size); }
This reverts commit 71bc5d496725f7f923904d2f41cd39e32c647fdf. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)