summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-07-05 15:03:44 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2016-07-11 20:09:40 +1000
commitda6a97bf12d57e341029b3624ed112175ecff514 (patch)
tree0a458e4facd8dddb1647aa4c4ae2b2d17be393bb /arch/powerpc/kernel/prom.c
parent63c254a501049f70c53aea602525c6912362079e (diff)
downloadblackbird-op-linux-da6a97bf12d57e341029b3624ed112175ecff514.tar.gz
blackbird-op-linux-da6a97bf12d57e341029b3624ed112175ecff514.zip
powerpc: Move epapr_paravirt_early_init() to early_init_devtree()
The function is called by both 32-bit and 64-bit early setup right after early_init_devtree(). All it does is run yet another early DT parser which is precisely what early_init_devtree() is about, so move it in there. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
-rw-r--r--arch/powerpc/kernel/prom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 946e34ffeae9..48434be99a07 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -56,6 +56,7 @@
#include <asm/opal.h>
#include <asm/fadump.h>
#include <asm/debug.h>
+#include <asm/epapr_hcalls.h>
#include <mm/mmu_decl.h>
@@ -739,6 +740,7 @@ void __init early_init_devtree(void *params)
/* Scan and build the list of machine check recoverable ranges */
of_scan_flat_dt(early_init_dt_scan_recoverable_ranges, NULL);
#endif
+ epapr_paravirt_early_init();
DBG(" <- early_init_devtree()\n");
}
OpenPOWER on IntegriCloud