diff options
| author | Quentin Perret <qperret@google.com> | 2021-05-12 15:28:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-14 10:44:33 +0300 |
| commit | 66b8853dfa3cfbbe6c3ab643b6989377ad16662a (patch) | |
| tree | 36218b6ead8db1d0363969a5785e4fb71107b051 | |
| parent | 3fe9ee040fb7332e2b4cc04c85561eced0a7f227 (diff) | |
| download | linux-66b8853dfa3cfbbe6c3ab643b6989377ad16662a.tar.xz | |
Revert "of/fdt: Make sure no-map does not remove already reserved regions"
This reverts commit 3cbd3038c9155038020560729cde50588311105d.
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>
| -rw-r--r-- | drivers/of/fdt.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index fc24102e25ce..036af904e0cf 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1153,16 +1153,8 @@ int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size) int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { - if (nomap) { - /* - * If the memory is already reserved (by another region), we - * should not allow it to be marked nomap. - */ - if (memblock_is_region_reserved(base, size)) - return -EBUSY; - + if (nomap) return memblock_mark_nomap(base, size); - } return memblock_reserve(base, size); } |