From: Michal Simek <monstr@monstr.eu>
Date: Tue, 22 Jun 2010 18:49:46 +0000 (+0200)
Subject: microblaze: Move PT_MODE saving to delay slot
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0a6b08fda6e3229713e779e30028598c067e904d;p=deliverable%2Flinux.git

microblaze: Move PT_MODE saving to delay slot

We can save one more instruction if PT_MODE is saved in delay slot

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

diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index f4fda8578551..6c117ceaabea 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -728,10 +728,8 @@ C_ENTRY(_interrupt):
 /* MS: Make room on the stack -> activation record */
 	addik	r1, r1, -STATE_SAVE_SIZE;
 	SAVE_REGS
-	swi	r1, r1, PTO + PT_MODE; /* 0 - user mode, 1 - kernel mode */
 	brid	2f;
-	nop; /* MS: Fill delay slot */
-
+	swi	r1, r1, PTO + PT_MODE; /* 0 - user mode, 1 - kernel mode */
 1:
 /* User-mode state save. */
  /* MS: get the saved current */