Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8351fcfe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-3.11' of git://sources.calxeda.com/kernel/linux 

Pull device tree fix from Rob Herring:
 "For DT unflattening, add missing memory initialization.

  This is needed for arches like PPC that use memblock_alloc.  This
  appears to have been an issue for some time, but is a somewhat limited
  usecase of OF_DYNAMIC"

* tag 'devicetree-fixes-for-3.11' of git://sources.calxeda.com/kernel/linux:
  of: fdt: fix memory initialization for expanded DT
parents ee7075d4 9e401275

drivers/of/fdt.c

+2 −0
Original line number Diff line number Diff line
@@ -392,6 +392,8 @@ static void __unflatten_device_tree(struct boot_param_header *blob, 
	mem = (unsigned long)

		dt_alloc(size + 4, __alignof__(struct device_node));



	memset((void *)mem, 0, size);



	((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);



	pr_debug("  unflattening %lx...\n", mem);