diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 15:37:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 15:37:07 -0500 |
| commit | 5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231 (patch) | |
| tree | 29dd80a7b33426d0890aa07b5864224557c62af7 /arch/blackfin/mach-common/entry.S | |
| parent | 0bb943c7a2136716757a263f604d26309fd98042 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'arch/blackfin/mach-common/entry.S')
| -rw-r--r-- | arch/blackfin/mach-common/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index c13fa8da28c7..bde6dc4e2614 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
| @@ -277,7 +277,7 @@ ENTRY(_bfin_return_from_exception) | |||
| 277 | p5.h = hi(ILAT); | 277 | p5.h = hi(ILAT); |
| 278 | r6 = [p5]; | 278 | r6 = [p5]; |
| 279 | r7 = 0x20; /* Did I just cause anther HW error? */ | 279 | r7 = 0x20; /* Did I just cause anther HW error? */ |
| 280 | r7 = r7 & r1; | 280 | r6 = r7 & r6; |
| 281 | CC = R7 == R6; | 281 | CC = R7 == R6; |
| 282 | if CC JUMP _double_fault; | 282 | if CC JUMP _double_fault; |
| 283 | #endif | 283 | #endif |