diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
| commit | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (patch) | |
| tree | d67f525c76b66956ba7ca0d40bc0fcda0e414700 /arch/parisc/kernel/traps.c | |
| parent | 9d7302299ee96ca954fe4ab8ca640333b6e19ad0 (diff) | |
| parent | 7135a71b19be1faf48b7148d77844d03bc0717d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/parisc/kernel/traps.c')
| -rw-r--r-- | arch/parisc/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 528f0ff9b273..8b58bf0b7d5a 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
| @@ -532,7 +532,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
| 532 | /* Kill the user process later */ | 532 | /* Kill the user process later */ |
| 533 | regs->iaoq[0] = 0 | 3; | 533 | regs->iaoq[0] = 0 | 3; |
| 534 | regs->iaoq[1] = regs->iaoq[0] + 4; | 534 | regs->iaoq[1] = regs->iaoq[0] + 4; |
| 535 | regs->iasq[0] = regs->iasq[0] = regs->sr[7]; | 535 | regs->iasq[0] = regs->iasq[1] = regs->sr[7]; |
| 536 | regs->gr[0] &= ~PSW_B; | 536 | regs->gr[0] &= ~PSW_B; |
| 537 | return; | 537 | return; |
| 538 | } | 538 | } |