Revert "fdt: Properly handle "no-map" field in the memory region"

This reverts commit fb326c6ce0dcbb6273202c6e012759754ec8538d.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 036af904e0cfabb1a9aef44f3a9af6eda0c5ac2c..223d617ecfe17458207dfc6dfb3c5b9c134d937f 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1154,7 +1154,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);
 }