Browse Source

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>
Michal Simek 15 years ago
parent
commit
da23355280
1 changed files with 1 additions and 2 deletions
  1. 1 2
      arch/microblaze/kernel/entry.S

+ 1 - 2
arch/microblaze/kernel/entry.S

@@ -282,9 +282,8 @@
 	tophys(r1,r1);							\
 	tophys(r1,r1);							\
 	addik	r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack.  */\
 	addik	r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack.  */\
 	SAVE_REGS							\
 	SAVE_REGS							\
-	swi	r1, r1, PTO+PT_MODE; 	 				\
 	brid	2f;							\
 	brid	2f;							\
-	nop;				/* Fill delay slot */		\
+	swi	r1, r1, PTO+PT_MODE; 	 				\
 1:	/* User-mode state save.  */					\
 1:	/* User-mode state save.  */					\
 	lwi	r1, r0, TOPHYS(PER_CPU(CURRENT_SAVE)); /* get saved current */\
 	lwi	r1, r0, TOPHYS(PER_CPU(CURRENT_SAVE)); /* get saved current */\
 	tophys(r1,r1);							\
 	tophys(r1,r1);							\