microblaze: Do not mix register saving and mode setting

Separate reg saving and mode setting.

Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index cf4a0aa35c0ee7073e5ed0a41b4863ca3ea2fca9..8f6b4eea4a6f5fb89a364bea7b12ba75bce7e3c9 100644 (file)
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -293,9 +293,9 @@
        tophys(r1,r1);                                                  \
        addik   r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack.  */\
        SAVE_REGS                                                       \
-       swi     r0, r1, PTO + PT_MODE; /* Was in user-mode.  */         \
        lwi     r11, r0, TOPHYS(PER_CPU(ENTRY_SP));                     \
        swi     r11, r1, PTO+PT_R1; /* Store user SP.  */               \
+       swi     r0, r1, PTO + PT_MODE; /* Was in user-mode.  */         \
        /* MS: I am clearing UMS even in case when I come from kernel space */ \
        clear_ums;                                                      \
 2:     lwi     CURRENT_TASK, r0, TOPHYS(PER_CPU(CURRENT_SAVE));