lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Move epapr_paravirt_early_init() to early_init_devtree()

Browse Source 
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>
This commit is contained in:
Benjamin Herrenschmidt 2016-07-05 15:03:44 +10:00 committed by Michael Ellerman
parent 63c254a501
commit da6a97bf12
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/prom.c
View File

@ -56,6 +56,7 @@
#include <asm/opal.h> #include <asm/opal.h>
#include <asm/fadump.h> #include <asm/fadump.h>
#include <asm/debug.h> #include <asm/debug.h>
#include <asm/epapr_hcalls.h>
#include <mm/mmu_decl.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 */ /* Scan and build the list of machine check recoverable ranges */
of_scan_flat_dt(early_init_dt_scan_recoverable_ranges, NULL); of_scan_flat_dt(early_init_dt_scan_recoverable_ranges, NULL);
#endif #endif
epapr_paravirt_early_init();
DBG(" <- early_init_devtree()\n"); DBG(" <- early_init_devtree()\n");
} }

3
arch/powerpc/kernel/setup_32.c
View File

@ -37,7 +37,6 @@
#include <asm/serial.h> #include <asm/serial.h>
#include <asm/udbg.h> #include <asm/udbg.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/epapr_hcalls.h>
#include <asm/code-patching.h> #include <asm/code-patching.h>
#define DBG(fmt...) #define DBG(fmt...)
@ -125,8 +124,6 @@ notrace void __init machine_init(u64 dt_ptr)
/* Do some early initialization based on the flat device tree */ /* Do some early initialization based on the flat device tree */
early_init_devtree(__va(dt_ptr)); early_init_devtree(__va(dt_ptr));
epapr_paravirt_early_init();
early_init_mmu(); early_init_mmu();
probe_machine(); probe_machine();

3
arch/powerpc/kernel/setup_64.c
View File

@ -68,7 +68,6 @@
#include <asm/code-patching.h> #include <asm/code-patching.h>
#include <asm/kvm_ppc.h> #include <asm/kvm_ppc.h>
#include <asm/hugetlb.h> #include <asm/hugetlb.h>
#include <asm/epapr_hcalls.h>
#include <asm/livepatch.h> #include <asm/livepatch.h>
#ifdef DEBUG #ifdef DEBUG
@ -270,8 +269,6 @@ void __init early_setup(unsigned long dt_ptr)
*/ */
early_init_devtree(__va(dt_ptr)); early_init_devtree(__va(dt_ptr));
epapr_paravirt_early_init();
/* Now we know the logical id of our boot cpu, setup the paca. */ /* Now we know the logical id of our boot cpu, setup the paca. */
setup_paca(&paca[boot_cpuid]); setup_paca(&paca[boot_cpuid]);
fixup_boot_paca(); fixup_boot_paca();