aboutsummaryrefslogtreecommitdiff
path: root/lib/of_live.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/of_live.c')
-rw-r--r--lib/of_live.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/of_live.c b/lib/of_live.c
index 1b5964d09a..05588d5ed2 100644
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -287,9 +287,12 @@ int unflatten_device_tree(const void *blob, struct device_node **mynodes)
debug(" size is %lx, allocating...\n", size);
/* Allocate memory for the expanded device tree */
- mem = malloc(size + 4);
+ mem = memalign(__alignof__(struct device_node), size + 4);
memset(mem, '\0', size);
+ /* Set up value for dm_test_livetree_align() */
+ *(u32 *)mem = BAD_OF_ROOT;
+
*(__be32 *)(mem + size) = cpu_to_be32(0xdeadbeef);
debug(" unflattening %p...\n", mem);