diff options
| author | Quentin Perret <qperret@google.com> | 2021-05-12 12:28:53 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-14 09:44:33 +0200 |
| commit | 6b183fbf18b91bc3c1fd02d5a48f7bc447d900ce (patch) | |
| tree | dd5ae32edbfab0563015081744a7a653a48ec474 /drivers/of/fdt.c | |
| parent | 66b8853dfa3cfbbe6c3ab643b6989377ad16662a (diff) | |
| download | linux-stable-6b183fbf18b91bc3c1fd02d5a48f7bc447d900ce.tar.gz linux-stable-6b183fbf18b91bc3c1fd02d5a48f7bc447d900ce.tar.bz2 linux-stable-6b183fbf18b91bc3c1fd02d5a48f7bc447d900ce.zip | |
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>
Diffstat (limited to 'drivers/of/fdt.c')
| -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 036af904e0cf..223d617ecfe1 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); } |