---

yaml
---
r: 204671
b: refs/heads/master
c: 25f6e59
h: refs/heads/master
i:
  204669: 2fc3ec0
  204667: f0b41d5
  204663: 4124fcc
  204655: 377bcef
  204639: 81d17d6
  204607: 8e65657
  204543: edb436f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 287503fabd9910cc77266142c7c8acbdb8efbf6b
+refs/heads/master: 25f6e59657211b3f7d912520c53fb7d98ebe960b

trunk/arch/microblaze/kernel/entry.S

@@ -352,6 +352,7 @@ C_ENTRY(_user_exception):
 	swi	r0, r1, PTO + PT_MODE;			/* Was in user-mode. */
 	lwi	r11, r0, TOPHYS(PER_CPU(ENTRY_SP));
 	swi	r11, r1, PTO+PT_R1;		/* Store user SP.  */
+	clear_ums;
 2:	lwi	CURRENT_TASK, r0, TOPHYS(PER_CPU(CURRENT_SAVE));
 	/* Save away the syscall number.  */
 	swi	r12, r1, PTO+PT_R0;
@@ -363,10 +364,8 @@ C_ENTRY(_user_exception):
  * register should point to the location where
  * the called function should return.  [note that MAKE_SYS_CALL uses label 1] */
 
-	# Step into virtual mode.
-	set_vms;
-	addik	r11, r0, 3f
-	rtid	r11, 0
+	/* Step into virtual mode */
+	rtbd	r0, 3f
 	nop
 3:
 	lwi	r11, CURRENT_TASK, TS_THREAD_INFO /* get thread info */