From: Quentin Perret <qperret@google.com>
Date: Wed, 12 May 2021 12:30:38 +0000 (+0000)
Subject: Revert "fdt: Properly handle "no-map" field in the memory region"
X-Git-Tag: v4.9.269~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51222297de3e39e68f481c328b22a8305b3aae9b;p=thirdparty%2Fkernel%2Fstable.git

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

This reverts commit 86ac82a7c708acf4738c396228be7b8fdaae4d99.
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 f90b626269ab6..e9360d5cbcbac 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1159,7 +1159,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);
 }