diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-19 15:01:53 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-19 15:01:53 +0000 |
| commit | ca3992bc0c12e381deb84cd47ec1181a6d34660d (patch) | |
| tree | 162006e862b9d856fdce1b19f0ba117dafb6ca58 /arch/powerpc/kernel/prom.c | |
| parent | 0829f6d1f69e4f2fae4062987ae6531a9af1a2e3 (diff) | |
| parent | 2040b52768ebab6e7bd73af0dc63703269c62f17 (diff) | |
Merge branch 'devicetree/next-reserved-mem' into devicetree/next
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index f58c0d3aaeb..59198621580 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -33,6 +33,7 @@ #include <linux/irq.h> #include <linux/memblock.h> #include <linux/of.h> +#include <linux/of_fdt.h> #include <asm/prom.h> #include <asm/rtas.h> @@ -588,6 +589,8 @@ static void __init early_reserve_mem_dt(void) memblock_reserve(base, size); } } + + early_init_fdt_scan_reserved_mem(); } static void __init early_reserve_mem(void) |