|
|
@@ -18,16 +18,16 @@ Signed-off-by: Catalin Marinas <[email protected]>
|
|
|
|
|
|
--- a/arch/arm64/mm/init.c
|
|
|
+++ b/arch/arm64/mm/init.c
|
|
|
-@@ -56,7 +56,7 @@ EXPORT_SYMBOL(physvirt_offset);
|
|
|
- struct page *vmemmap __ro_after_init;
|
|
|
- EXPORT_SYMBOL(vmemmap);
|
|
|
+@@ -50,7 +50,7 @@
|
|
|
+ s64 memstart_addr __ro_after_init = -1;
|
|
|
+ EXPORT_SYMBOL(memstart_addr);
|
|
|
|
|
|
-phys_addr_t arm64_dma_phys_limit __ro_after_init;
|
|
|
+phys_addr_t arm64_dma32_phys_limit __ro_after_init;
|
|
|
|
|
|
#ifdef CONFIG_KEXEC_CORE
|
|
|
/*
|
|
|
-@@ -174,7 +174,7 @@ static void __init reserve_elfcorehdr(vo
|
|
|
+@@ -168,7 +168,7 @@ static void __init reserve_elfcorehdr(vo
|
|
|
* currently assumes that for memory starting above 4G, 32-bit devices will
|
|
|
* use a DMA offset.
|
|
|
*/
|
|
|
@@ -36,7 +36,7 @@ Signed-off-by: Catalin Marinas <[email protected]>
|
|
|
{
|
|
|
phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32);
|
|
|
return min(offset + (1ULL << 32), memblock_end_of_DRAM());
|
|
|
-@@ -187,7 +187,7 @@ static void __init zone_sizes_init(unsig
|
|
|
+@@ -181,7 +181,7 @@ static void __init zone_sizes_init(unsig
|
|
|
unsigned long max_zone_pfns[MAX_NR_ZONES] = {0};
|
|
|
|
|
|
#ifdef CONFIG_ZONE_DMA32
|
|
|
@@ -45,7 +45,7 @@ Signed-off-by: Catalin Marinas <[email protected]>
|
|
|
#endif
|
|
|
max_zone_pfns[ZONE_NORMAL] = max;
|
|
|
|
|
|
-@@ -200,16 +200,16 @@ static void __init zone_sizes_init(unsig
|
|
|
+@@ -194,16 +194,16 @@ static void __init zone_sizes_init(unsig
|
|
|
{
|
|
|
struct memblock_region *reg;
|
|
|
unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];
|
|
|
@@ -66,7 +66,7 @@ Signed-off-by: Catalin Marinas <[email protected]>
|
|
|
|
|
|
memcpy(zhole_size, zone_size, sizeof(zhole_size));
|
|
|
|
|
|
-@@ -221,14 +221,14 @@ static void __init zone_sizes_init(unsig
|
|
|
+@@ -215,14 +215,14 @@ static void __init zone_sizes_init(unsig
|
|
|
continue;
|
|
|
|
|
|
#ifdef CONFIG_ZONE_DMA32
|
|
|
@@ -85,7 +85,7 @@ Signed-off-by: Catalin Marinas <[email protected]>
|
|
|
zhole_size[ZONE_NORMAL] -= normal_end - normal_start;
|
|
|
}
|
|
|
}
|
|
|
-@@ -420,9 +420,9 @@ void __init arm64_memblock_init(void)
|
|
|
+@@ -410,9 +410,9 @@ void __init arm64_memblock_init(void)
|
|
|
|
|
|
/* 4GB maximum for 32-bit only capable devices */
|
|
|
if (IS_ENABLED(CONFIG_ZONE_DMA32))
|
|
|
@@ -97,7 +97,7 @@ Signed-off-by: Catalin Marinas <[email protected]>
|
|
|
|
|
|
reserve_crashkernel();
|
|
|
|
|
|
-@@ -430,7 +430,7 @@ void __init arm64_memblock_init(void)
|
|
|
+@@ -420,7 +420,7 @@ void __init arm64_memblock_init(void)
|
|
|
|
|
|
high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
|
|
|
|
|
|
@@ -106,7 +106,7 @@ Signed-off-by: Catalin Marinas <[email protected]>
|
|
|
}
|
|
|
|
|
|
void __init bootmem_init(void)
|
|
|
-@@ -534,7 +534,7 @@ static void __init free_unused_memmap(vo
|
|
|
+@@ -524,7 +524,7 @@ static void __init free_unused_memmap(vo
|
|
|
void __init mem_init(void)
|
|
|
{
|
|
|
if (swiotlb_force == SWIOTLB_FORCE ||
|