xtensa: Flat DeviceTree copy not future-safe

Vineet Gupta · czankel · commit 220f5354089b · 2013-07-08T01:18:57.000-07:00
flat DT copy code calls bootmem allocator with @align = 0. This is probably OK with legacy allocator which xtensa uses right now, but this will panic right away with memblock allocator Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Cc: Chris Zankel <chris@zankel.net> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Marc Gauthier <marc@tensilica.com> Cc: linux-xtensa@linux-xtensa.org Cc: linux-kernel@vger.kernel.org Acked-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
@@ -256,7 +256,7 @@ void __init early_init_devtree(void *params)
 static void __init copy_devtree(void)
 {
 	void *alloc = early_init_dt_alloc_memory_arch(
-			be32_to_cpu(initial_boot_params->totalsize), 0);
+			be32_to_cpu(initial_boot_params->totalsize), 8);
 	if (alloc) {
 		memcpy(alloc, initial_boot_params,
 				be32_to_cpu(initial_boot_params->totalsize));

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ void __init early_init_devtree(void *params)`
`256`	`256`	`static void __init copy_devtree(void)`
`257`	`257`	`{`
`258`	`258`	`void *alloc = early_init_dt_alloc_memory_arch(`
`259`		`- be32_to_cpu(initial_boot_params->totalsize), 0);`
	`259`	`+ be32_to_cpu(initial_boot_params->totalsize), 8);`
`260`	`260`	`if (alloc) {`
`261`	`261`	`memcpy(alloc, initial_boot_params,`
`262`	`262`	`be32_to_cpu(initial_boot_params->totalsize));`