---

yaml --- r: 204668 b: refs/heads/master c: da23355 h: refs/heads/master v: v3
git-mirror · Aug 4, 2010 · eff591c · eff591c
1 parent f0b41d5
commit eff591c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7741075b37e2be6693def1ff98487e3aef67874
+refs/heads/master: da23355280d106b1160a0a07028838097b639f0b
diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/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);							\