The patch titled
Subject: arm64-support-initrd-outside-kernel-linear-map-v4
has been removed from the -mm tree. Its filename was
arm64-support-initrd-outside-kernel-linear-map-v4.patch
This patch was dropped because it was folded into arm64-support-initrd-outside-kernel-linear-map.patch
------------------------------------------------------
From: Mark Salter <msalter@xxxxxxxxxx>
Subject: arm64-support-initrd-outside-kernel-linear-map-v4
Fixed arm64 build error with !CONFIG_BLK_DEV_INITRD case
Fixed nonsensical comment in arm64 relocate_initrd()
Moved #ifdef outside arm64 relocate_initrd() definition
Signed-off-by: Mark Salter <msalter@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm64/kernel/setup.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff -puN arch/arm64/kernel/setup.c~arm64-support-initrd-outside-kernel-linear-map-v4 arch/arm64/kernel/setup.c
--- a/arch/arm64/kernel/setup.c~arm64-support-initrd-outside-kernel-linear-map-v4
+++ a/arch/arm64/kernel/setup.c
@@ -339,13 +339,13 @@ static void __init request_standard_reso
}
}
+#ifdef CONFIG_BLK_DEV_INITRD
/*
* Relocate initrd if it is not completely within the linear mapping.
* This would be the case if mem= cuts out all or part of it.
*/
static void __init relocate_initrd(void)
{
-#ifdef CONFIG_BLK_DEV_INITRD
phys_addr_t orig_start = __virt_to_phys(initrd_start);
phys_addr_t orig_end = __virt_to_phys(initrd_end);
phys_addr_t ram_end = memblock_end_of_DRAM();
@@ -356,7 +356,10 @@ static void __init relocate_initrd(void)
if (orig_end <= ram_end)
return;
- /* Note if any of original initrd will freeing below */
+ /*
+ * Any of the original initrd which overlaps the linear map should
+ * be freed after relocating.
+ */
if (orig_start < ram_end)
to_free = ram_end - orig_start;
@@ -390,8 +393,12 @@ static void __init relocate_initrd(void)
orig_start, orig_start + to_free - 1);
memblock_free(orig_start, to_free);
}
-#endif
}
+#else
+static inline void __init relocate_initrd(void)
+{
+}
+#endif
u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
_
Patches currently in -mm which might be from msalter@xxxxxxxxxx are
mm-add-utility-for-early-copy-from-unmapped-ram.patch
arm64-support-initrd-outside-kernel-linear-map.patch
x86-use-generic-early-mem-copy.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
