From 2bdf4c590aa28ee6b27bf2a43e73112475312b32 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 22 Jun 2010 15:25:24 +0200
Subject: [PATCH] --- yaml --- r: 204657 b: refs/heads/master c:
 06b2864038517905752bdacd95f1f265ef780f3b h: refs/heads/master i:   204655:
 377bcefb2e5430b21b1bec23c100d04e648630c6 v: v3

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

diff --git a/[refs] b/[refs]
index dc887f26fd77..2ac7626bb662 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b110d157c82f3818fc578b633f0cf7ace9efc22
+refs/heads/master: 06b2864038517905752bdacd95f1f265ef780f3b
diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S
index 042657165184..04267ca949f0 100644
--- a/trunk/arch/microblaze/kernel/entry.S
+++ b/trunk/arch/microblaze/kernel/entry.S
@@ -895,15 +895,12 @@ C_ENTRY(_debug_exception):
 	swi	r0, r1, PTO+PT_R0;
 	tovirt(r1,r1)
 
+	set_vms;
 	addi	r5, r0, SIGTRAP		     /* send the trap signal */
 	add	r6, r0, CURRENT_TASK; /* Get current task ptr into r11 */
 	addk	r7, r0, r0		     /* 3rd param zero */
-
-	set_vms;
-	addik	r11, r0, send_sig;
+dbtrap_call:	rtbd	r0, send_sig;
 	addik	r15, r0, dbtrap_call;
-dbtrap_call:	rtbd	r11, 0;
-	nop;
 
 	set_bip;			/*  Ints masked for state restore*/
 	lwi	r11, r1, PTO+PT_MODE;