diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-02-28 14:42:56 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-13 10:53:23 +0000 |
| commit | 708b7eef12f945a510ba5ac3b4007d7ae4796d55 (patch) | |
| tree | 6f0eb44131a073a4b6bdb5e60cd8e13660506870 /arch/powerpc | |
| parent | 9bf14b7c540ae9ca7747af3a0c0d8470ef77b6ce (diff) | |
| download | linux-stable-708b7eef12f945a510ba5ac3b4007d7ae4796d55.tar.gz linux-stable-708b7eef12f945a510ba5ac3b4007d7ae4796d55.tar.bz2 linux-stable-708b7eef12f945a510ba5ac3b4007d7ae4796d55.zip | |
powerpc: add support for reserved memory defined by device tree
Enable reserved memory initialization from device tree.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 957bf344c0f5..3b6617fed8fc 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -90,6 +90,7 @@ config PPC select BINFMT_ELF select OF select OF_EARLY_FLATTREE + select OF_RESERVED_MEM select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE select HAVE_FUNCTION_TRACER diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index f58c0d3aaeb4..591986215801 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) |