From 9b7dae41752b7961d38337ec36b20de0986f6c07 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 22 Jun 2010 18:50:31 +0200
Subject: [PATCH] --- yaml --- r: 204672 b: refs/heads/master c:
 80c5ff6b9b2dd9a2e99d3d6f74df5e6f888d43e9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1d338c08ae89..9e8c3474b899 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25f6e59657211b3f7d912520c53fb7d98ebe960b
+refs/heads/master: 80c5ff6b9b2dd9a2e99d3d6f74df5e6f888d43e9
diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S
index 4c06e1a46a25..f4fda8578551 100644
--- a/trunk/arch/microblaze/kernel/entry.S
+++ b/trunk/arch/microblaze/kernel/entry.S
@@ -747,15 +747,13 @@ C_ENTRY(_interrupt):
 	swi	r0, r1, PTO + PT_MODE;
 	lwi	r11, r0, TOPHYS(PER_CPU(ENTRY_SP));
 	swi	r11, r1, PTO+PT_R1;
+	clear_ums;
 2:
 	lwi	CURRENT_TASK, r0, TOPHYS(PER_CPU(CURRENT_SAVE));
 	tovirt(r1,r1)
-	addik	r5, r1, PTO;
-	set_vms;
-	addik	r11, r0, do_IRQ;
 	addik	r15, r0, irq_call;
-irq_call:rtbd	r11, 0;
-	nop;
+irq_call:rtbd	r0, do_IRQ;
+	addik	r5, r1, PTO;
 
 /* MS: we are in virtual mode */
 ret_from_irq: