diff options
-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 | |||
90 | select BINFMT_ELF | 90 | select BINFMT_ELF |
91 | select OF | 91 | select OF |
92 | select OF_EARLY_FLATTREE | 92 | select OF_EARLY_FLATTREE |
93 | select OF_RESERVED_MEM | ||
93 | select HAVE_FTRACE_MCOUNT_RECORD | 94 | select HAVE_FTRACE_MCOUNT_RECORD |
94 | select HAVE_DYNAMIC_FTRACE | 95 | select HAVE_DYNAMIC_FTRACE |
95 | select HAVE_FUNCTION_TRACER | 96 | 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 @@ | |||
33 | #include <linux/irq.h> | 33 | #include <linux/irq.h> |
34 | #include <linux/memblock.h> | 34 | #include <linux/memblock.h> |
35 | #include <linux/of.h> | 35 | #include <linux/of.h> |
36 | #include <linux/of_fdt.h> | ||
36 | 37 | ||
37 | #include <asm/prom.h> | 38 | #include <asm/prom.h> |
38 | #include <asm/rtas.h> | 39 | #include <asm/rtas.h> |
@@ -588,6 +589,8 @@ static void __init early_reserve_mem_dt(void) | |||
588 | memblock_reserve(base, size); | 589 | memblock_reserve(base, size); |
589 | } | 590 | } |
590 | } | 591 | } |
592 | |||
593 | early_init_fdt_scan_reserved_mem(); | ||
591 | } | 594 | } |
592 | 595 | ||
593 | static void __init early_reserve_mem(void) | 596 | static void __init early_reserve_mem(void) |