From baace55bd64e30648661086679feab0dce786acd Mon Sep 17 00:00:00 2001
From: Graf Yang <graf.yang@analog.com>
Date: Tue, 18 Nov 2008 17:48:22 +0800
Subject: [PATCH] --- yaml --- r: 119142 b: refs/heads/master c:
 4213cb64004e38b3e78424f30e1e638f8004c7a8 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/blackfin/mach-common/entry.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9f01f7058a22..1d253698cc34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2c2f30388c682520ae2d07c8852b4225dd4a4d7
+refs/heads/master: 4213cb64004e38b3e78424f30e1e638f8004c7a8
diff --git a/trunk/arch/blackfin/mach-common/entry.S b/trunk/arch/blackfin/mach-common/entry.S
index c13fa8da28c7..bde6dc4e2614 100644
--- a/trunk/arch/blackfin/mach-common/entry.S
+++ b/trunk/arch/blackfin/mach-common/entry.S
@@ -277,7 +277,7 @@ ENTRY(_bfin_return_from_exception)
 	p5.h = hi(ILAT);
 	r6 = [p5];
 	r7 = 0x20;		/* Did I just cause anther HW error? */
-	r7 = r7 & r1;
+	r6 = r7 & r6;
 	CC = R7 == R6;
 	if CC JUMP _double_fault;
 #endif