]> Pileus Git - ~andy/linux/commitdiff
xtensa: Flat DeviceTree copy not future-safe
authorVineet Gupta <Vineet.Gupta1@synopsys.com>
Thu, 21 Feb 2013 18:39:22 +0000 (00:09 +0530)
committerChris Zankel <chris@zankel.net>
Mon, 8 Jul 2013 08:18:57 +0000 (01:18 -0700)
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>
arch/xtensa/kernel/setup.c

index 14c6c3a6f04b018dbf937796d06767247f655730..42a8bba0b0ead4235add5133b7e849187641da53 100644 (file)
@@ -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));