Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd', 'asoc/topic...

[mirror_ubuntu-focal-kernel.git] / arch / mips / include / asm / stackframe.h

diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h
index 5d3563c55e0c224bc62d20815568d61953f9902c..2161357cc68f094fb5b9c1287c38232dd19d390c 100644 (file)
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
@@ -199,6 +199,10 @@
                sll     k0, 3           /* extract cu0 bit */
                .set    noreorder
                bltz    k0, 8f
+                move   k0, sp
+               .if \docfi
+               .cfi_register sp, k0
+               .endif
 #ifdef CONFIG_EVA
                /*
                 * Flush interAptiv's Return Prediction Stack (RPS) by writing
@@ -225,10 +229,6 @@
                MTC0    k0, CP0_ENTRYHI
 #endif
                .set    reorder
-                move   k0, sp
-               .if \docfi
-               .cfi_register sp, k0
-               .endif
                /* Called from user mode, new stack. */
                get_saved_sp docfi=\docfi tosp=1
 8: