diff options
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index b51f797d9d9d..406757a9d7ea 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c | |||
| @@ -10,16 +10,18 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/lmb.h> | ||
| 14 | #include <linux/initrd.h> | 13 | #include <linux/initrd.h> |
| 15 | #include <linux/of.h> | 14 | #include <linux/of.h> |
| 16 | #include <linux/of_fdt.h> | 15 | #include <linux/of_fdt.h> |
| 17 | 16 | #include <linux/string.h> | |
| 17 | #include <linux/errno.h> | ||
| 18 | 18 | ||
| 19 | #ifdef CONFIG_PPC | 19 | #ifdef CONFIG_PPC |
| 20 | #include <asm/machdep.h> | 20 | #include <asm/machdep.h> |
| 21 | #endif /* CONFIG_PPC */ | 21 | #endif /* CONFIG_PPC */ |
| 22 | 22 | ||
| 23 | #include <asm/page.h> | ||
| 24 | |||
| 23 | int __initdata dt_root_addr_cells; | 25 | int __initdata dt_root_addr_cells; |
| 24 | int __initdata dt_root_size_cells; | 26 | int __initdata dt_root_size_cells; |
| 25 | 27 | ||
| @@ -560,7 +562,8 @@ void __init unflatten_device_tree(void) | |||
| 560 | pr_debug(" size is %lx, allocating...\n", size); | 562 | pr_debug(" size is %lx, allocating...\n", size); |
| 561 | 563 | ||
| 562 | /* Allocate memory for the expanded device tree */ | 564 | /* Allocate memory for the expanded device tree */ |
| 563 | mem = lmb_alloc(size + 4, __alignof__(struct device_node)); | 565 | mem = early_init_dt_alloc_memory_arch(size + 4, |
| 566 | __alignof__(struct device_node)); | ||
| 564 | mem = (unsigned long) __va(mem); | 567 | mem = (unsigned long) __va(mem); |
| 565 | 568 | ||
| 566 | ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef); | 569 | ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef); |
