diff options
author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2013-02-21 13:39:22 -0500 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2013-07-08 04:18:57 -0400 |
commit | 220f5354089b27e8eeaa8658806dabc59ce55729 (patch) | |
tree | 2afc4d94520cdb8de6045bb894ccf5fa62d83e33 /arch/xtensa/kernel | |
parent | a99e07ee5e887750f5136bc6799abe47a56fd2c9 (diff) |
xtensa: Flat DeviceTree copy not future-safe
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>
Diffstat (limited to 'arch/xtensa/kernel')
-rw-r--r-- | arch/xtensa/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 14c6c3a6f04b..42a8bba0b0ea 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c | |||
@@ -256,7 +256,7 @@ void __init early_init_devtree(void *params) | |||
256 | static void __init copy_devtree(void) | 256 | static void __init copy_devtree(void) |
257 | { | 257 | { |
258 | void *alloc = early_init_dt_alloc_memory_arch( | 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 | if (alloc) { | 260 | if (alloc) { |
261 | memcpy(alloc, initial_boot_params, | 261 | memcpy(alloc, initial_boot_params, |
262 | be32_to_cpu(initial_boot_params->totalsize)); | 262 | be32_to_cpu(initial_boot_params->totalsize)); |