git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
traps.c
diff --git
a/arch/parisc/kernel/traps.c
b/arch/parisc/kernel/traps.c
index
528f0ff
..
8b58bf0
100644
(file)
--- 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)
/* Kill the user process later */
regs->iaoq[0] = 0 | 3;
regs->iaoq[1] = regs->iaoq[0] + 4;
- regs->iasq[0] = regs->iasq[
0
] = regs->sr[7];
+ regs->iasq[0] = regs->iasq[
1
] = regs->sr[7];
regs->gr[0] &= ~PSW_B;
return;
}