From e89fbcf7e3fb1689766bf5c350da3419a4ef96ea Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 22 Jun 2010 16:25:31 +0200
Subject: [PATCH] --- yaml --- r: 204664 b: refs/heads/master c:
 c318d483b3d9cf68d791b4024760cb171dae1215 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 11bcdc839f62..95cd37df2c0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b318067e2c946a560035faf47e24a20e50696cce
+refs/heads/master: c318d483b3d9cf68d791b4024760cb171dae1215
diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S
index 5529f64e97e8..ff8d9872c774 100644
--- a/trunk/arch/microblaze/kernel/entry.S
+++ b/trunk/arch/microblaze/kernel/entry.S
@@ -562,10 +562,8 @@ C_ENTRY(full_exception_trap):
 	nop
 	mts	rfsr, r0;	/* Clear sticky fsr */
 	nop
-	addik	r12, r0, full_exception
-	set_vms;
-	rted	r12, 0;
-	nop;
+	rted	r0, full_exception
+	nop
 
 /*
  * Unaligned data trap.
@@ -599,11 +597,8 @@ C_ENTRY(unaligned_data_trap):
 	nop
 	mfs	r4, rear		/* EAR */
 	nop
+	rtbd	r0, _unaligned_data_exception
 	addik	r7, r1, PTO		/* parameter struct pt_regs * regs */
-	addik	r12, r0, _unaligned_data_exception
-	set_vms;
-	rtbd	r12, 0;	/* interrupts enabled */
-	nop;
 
 /*
  * Page fault traps.
@@ -635,10 +630,8 @@ C_ENTRY(page_fault_data_trap):
 	nop
 	mfs	r7, resr		/* parameter unsigned long error_code */
 	nop
-	addik	r12, r0, do_page_fault
-	set_vms;
-	rted	r12, 0;	/* interrupts enabled */
-	nop;
+	rted	r0, do_page_fault
+	nop
 
 C_ENTRY(page_fault_instr_trap):
 	SAVE_STATE		/* Save registers.*/
@@ -650,11 +643,8 @@ C_ENTRY(page_fault_instr_trap):
 	addik	r5, r1, PTO		/* parameter struct pt_regs * regs */
 	mfs	r6, rear		/* parameter unsigned long address */
 	nop
+	rted	r0, do_page_fault
 	ori	r7, r0, 0		/* parameter unsigned long error_code */
-	addik	r12, r0, do_page_fault
-	set_vms;
-	rted	r12, 0;	/* interrupts enabled */
-	nop;
 
 /* Entry point used to return from an exception.  */
 C_ENTRY(ret_from_exc):