diff options
| author | Quentin Perret <qperret@google.com> | 2021-05-12 12:30:10 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-22 10:59:39 +0200 |
| commit | d34eed2fb86b94757cdf26d6b0e31fa64a987f47 (patch) | |
| tree | 7850bb0496d89bf824bb8640d8ea215d590c7e9e /drivers | |
| parent | 59339c866e0428fb92bfb3f5290c49a5325d2494 (diff) | |
Revert "of/fdt: Make sure no-map does not remove already reserved regions"
This reverts commit 74f2678aab60c9915daa83e6e23d31a896932d9d.
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')
| -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 21160a08ead4..aa15e5d183c1 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1172,16 +1172,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); } |