From 179fa34798512efa15728630ee4926870a4d653f Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 22 Jun 2010 18:29:05 +0200
Subject: [PATCH] --- yaml --- r: 204671 b: refs/heads/master c:
 25f6e59657211b3f7d912520c53fb7d98ebe960b h: refs/heads/master i:   204669:
 2fc3ec08b569ff8144b78a4a9b12964927e2bc2a   204667:
 f0b41d5ce1c7434574ba4d81a294c41b1d4f702c   204663:
 4124fccb77aaa513e8e2d89187f20fb6d0d7475d   204655:
 377bcefb2e5430b21b1bec23c100d04e648630c6   204639:
 81d17d6b5f9554ce9548fa8bfc734abe689bc3cf   204607:
 8e6565722b89a704b729134c541475132d646c5b   204543:
 edb436f7738aa0e38c5026bcdbf9e389be5284b5 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/microblaze/kernel/entry.S | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5b7a212c3cb2..1d338c08ae89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 287503fabd9910cc77266142c7c8acbdb8efbf6b
+refs/heads/master: 25f6e59657211b3f7d912520c53fb7d98ebe960b
diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S
index e7abf7426c8c..4c06e1a46a25 100644
--- a/trunk/arch/microblaze/kernel/entry.S
+++ b/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 */