diff options
| author | Quentin Perret <qperret@google.com> | 2021-05-12 12:30:11 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-22 10:59:39 +0200 |
| commit | e175080d34dd7ccfc7b99c77a7a49147f6443ee0 (patch) | |
| tree | a28d870d8037a1c4fe204d2fcb53dc94da98d9ea /drivers/of | |
| parent | d34eed2fb86b94757cdf26d6b0e31fa64a987f47 (diff) | |
| download | linux-stable-e175080d34dd7ccfc7b99c77a7a49147f6443ee0.tar.gz linux-stable-e175080d34dd7ccfc7b99c77a7a49147f6443ee0.tar.bz2 linux-stable-e175080d34dd7ccfc7b99c77a7a49147f6443ee0.zip | |
Revert "fdt: Properly handle "no-map" field in the memory region"
This reverts commit 03972d6b1bbac1620455589e0367f6f69ff7b2df.
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>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index aa15e5d183c1..800ad252cf9c 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1173,7 +1173,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); } |