---

yaml --- r: 204673 b: refs/heads/master c: 0a6b08f h: refs/heads/master i: 204671: 179fa34 v: v3
git-mirror · Aug 4, 2010 · 97c3f8d · 97c3f8d
1 parent 9b7dae4
commit 97c3f8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80c5ff6b9b2dd9a2e99d3d6f74df5e6f888d43e9
+refs/heads/master: 0a6b08fda6e3229713e779e30028598c067e904d
diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/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 */