6fee4247f9
patch source https://lore.kernel.org/linux-amlogic/1c71a7c1e58590811094ebdd0e1abc54@agner.ch/T/#t
20 lines
657 B
Diff
20 lines
657 B
Diff
diff -Naur a/drivers/of/fdt.c b/drivers/of/fdt.c
|
|
--- a/drivers/of/fdt.c 2022-01-27 05:05:44.000000000 -0500
|
|
+++ b/drivers/of/fdt.c 2022-01-27 11:30:37.610221700 -0500
|
|
@@ -480,15 +480,6 @@
|
|
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, but don't worry
|
|
- * if the region isn't memory as it won't be mapped.
|
|
- */
|
|
- if (memblock_overlaps_region(&memblock.memory, base, size) &&
|
|
- memblock_is_region_reserved(base, size))
|
|
- return -EBUSY;
|
|
-
|
|
return memblock_mark_nomap(base, size);
|
|
}
|
|
return memblock_reserve(base, size);
|