microblaze: Save kernel mode in delay slot

This change save one instruction if kernel comes from kernel
space.

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

diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index 8f6b4eea4a6f5fb89a364bea7b12ba75bce7e3c9..0747e1d61d553d4064e59f7e9701feed211b64d2 100644 (file)
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -282,9 +282,8 @@
        tophys(r1,r1);                                                  \
        addik   r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack.  */\
        SAVE_REGS                                                       \
-       swi     r1, r1, PTO+PT_MODE;                                    \
        brid    2f;                                                     \
-       nop;                            /* Fill delay slot */           \
+       swi     r1, r1, PTO+PT_MODE;                                    \
 1:     /* User-mode state save.  */                                    \
        lwi     r1, r0, TOPHYS(PER_CPU(CURRENT_SAVE)); /* get saved current */\
        tophys(r1,r1);                                                  \