summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGraf Yang <graf.yang@analog.com>2008-11-18 17:48:22 +0800
committerBryan Wu <cooloney@kernel.org>2008-11-18 17:48:22 +0800
commit4213cb64004e38b3e78424f30e1e638f8004c7a8 (patch)
tree87421dd20bf7b1eb3cbc788747e9d2e6f8596d76 /arch
parentb2c2f30388c682520ae2d07c8852b4225dd4a4d7 (diff)
downloadlinux-3.10-4213cb64004e38b3e78424f30e1e638f8004c7a8.tar.gz
linux-3.10-4213cb64004e38b3e78424f30e1e638f8004c7a8.tar.bz2
linux-3.10-4213cb64004e38b3e78424f30e1e638f8004c7a8.zip
Blackfin arch: fix bug - Turn on DEBUG_DOUBLEFAULT, booting SMP kernel crash
Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/mach-common/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index c13fa8da28c..bde6dc4e261 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/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