Message ID | 1467695057-12431-7-git-send-email-benh@kernel.crashing.org (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Tue, 2016-05-07 at 05:03:42 UTC, Benjamin Herrenschmidt wrote: > Make it part of early_setup() as we really want the feature fixups > to be applied before we turn on the MMU since they can have an impact > on the various assembly path related to MMU management and interrupts. > > This makes 64-bit match what 32-bit does. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/c4bd6cb87c9e28a7d9f4a97db5 cheers
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 996bed2..e79cf1b 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -286,6 +286,9 @@ void __init early_setup(unsigned long dt_ptr) /* Initialize the hash table or TLB handling */ early_init_mmu(); + /* Apply all the dynamic patching */ + apply_feature_fixups(); + /* * At this point, we can let interrupts switch to virtual mode * (the MMU has been setup), so adjust the MSR in the PACA to @@ -468,8 +471,6 @@ void __init setup_system(void) { DBG(" -> setup_system()\n"); - apply_feature_fixups(); - /* * Unflatten the device-tree passed by prom_init or kexec */
Make it part of early_setup() as we really want the feature fixups to be applied before we turn on the MMU since they can have an impact on the various assembly path related to MMU management and interrupts. This makes 64-bit match what 32-bit does. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/kernel/setup_64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)