microblaze: Separate GP registers from MSR handling

Separate general purpose register restoring from MSR handling.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index ef548510b951..285e8880e274 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -208,9 +208,7 @@ syscall_debug_table:
         mfs     r11, rmsr;              /* save MSR */                  \
         swi     r11, r1, PT_MSR;
 
-#define RESTORE_REGS \
-        lwi     r11, r1, PT_MSR;                                        \
-        mts     rmsr , r11;                                             \
+#define RESTORE_REGS_GP \
         lwi     r2, r1, PT_R2;  /* restore SDA */               \
         lwi     r3, r1, PT_R3;                                  \
         lwi     r4, r1, PT_R4;                                  \
@@ -242,6 +240,11 @@ syscall_debug_table:
         lwi     r30, r1, PT_R30;                                        \
         lwi     r31, r1, PT_R31;        /* Restore cur task reg */
 
+#define RESTORE_REGS \
+        lwi     r11, r1, PT_MSR;                                        \
+        mts     rmsr , r11;                                             \
+        RESTORE_REGS_GP
+
 #define SAVE_STATE      \
         swi     r1, r0, TOPHYS(PER_CPU(ENTRY_SP)); /* save stack */     \
         /* See if already in kernel mode.*/                             \