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>
mariux64 · Aug 4, 2010 · da23355 · da23355
1 parent e774107
commit da23355
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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);							\