1 files changed, 27 insertions, 10 deletions

diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index 4566683abc8d..ef12c0e6fa25 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -48,17 +48,36 @@
          */
 
         __HEAD
+        .begin  no-absolute-literals
+
 ENTRY(_start)
 
-        _j      2f
+        /* Preserve the pointer to the boot parameter list in EXCSAVE_1 */
+        wsr     a2, excsave1
+        _j      _SetupMMU
+
+        .align  4
+        .literal_position
+.Lstartup:
+        .word   _startup
+
         .align  4
-1:      .word   _startup
-2:      l32r    a0, 1b
+        .global _SetupMMU
+_SetupMMU:
+        Offset = _SetupMMU - _start
+
+#ifdef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
+        initialize_mmu
+#endif
+        .end    no-absolute-literals
+
+        l32r    a0, .Lstartup
         jx      a0
 
 ENDPROC(_start)
 
-        .section .init.text, "ax"
+        __INIT
+        .literal_position
 
 ENTRY(_startup)
 
@@ -67,10 +86,6 @@ ENTRY(_startup)
         movi    a0, LOCKLEVEL
         wsr     a0, ps
 
-        /* Preserve the pointer to the boot parameter list in EXCSAVE_1 */
-
-        wsr     a2, excsave1
-
         /* Start with a fresh windowbase and windowstart.  */
 
         movi    a1, 1
@@ -158,8 +173,6 @@ ENTRY(_startup)
 
         isync
 
-        initialize_mmu
-
         /* Unpack data sections
          *
          * The linker script used to build the Linux kernel image
@@ -207,6 +220,10 @@ ENTRY(_startup)
 
         ___flush_dcache_all a2 a3
 #endif
+        memw
+        isync
+        ___invalidate_icache_all a2 a3
+        isync
 
         /* Setup stack and enable window exceptions (keep irqs disabled) */