---

yaml --- r: 119142 b: refs/heads/master c: 4213cb6 h: refs/heads/master v: v3
git-mirror · Nov 18, 2008 · baace55 · baace55
1 parent 7fc7498
commit baace55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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