From: Quentin Perret <qperret@google.com>
Date: Wed, 12 May 2021 12:28:53 +0000 (+0000)
Subject: Revert "fdt: Properly handle "no-map" field in the memory region"
X-Git-Tag: v5.4.119~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6b183fbf18b91bc3c1fd02d5a48f7bc447d900ce;p=users%2Fdwmw2%2Flinux.git

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 036af904e0cfa..223d617ecfe17 100644
--- 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);
 }