summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIvan Kokshaysky <ink@jurassic.park.msu.ru>2005-06-30 20:02:18 +0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 22:29:48 -0700
commiteaf05be039cf5adfba5b1846452ce89646110fdb (patch)
treeda81bed900c4a80f53379feb2de477fc4047792c /arch
parent62351cc38d3eaf3de0327054dd6ebc039f4da80d (diff)
downloadlinux-3.10-eaf05be039cf5adfba5b1846452ce89646110fdb.tar.gz
linux-3.10-eaf05be039cf5adfba5b1846452ce89646110fdb.tar.bz2
linux-3.10-eaf05be039cf5adfba5b1846452ce89646110fdb.zip
[PATCH] alpha smp fix
As usual, the reason of this breakage is quite silly: in do_entIF, we are checking for PS == 0 to see whether it was a kernel BUG() or userspace trap. It works, unless BUG() happens in interrupt - PS is not 0 in kernel mode due to non-zero IPL, and the things get messed up horribly then. In this particular case it was BUG_ON(!irqs_disabled()) triggered in run_posix_cpu_timers(), so we ended up shooting "current" with the bursts of one SIGTRAP and three SIGILLs on every timer tick. ;-)
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index fd7bd17cc96..6f509a644bd 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -240,7 +240,7 @@ do_entIF(unsigned long type, struct pt_regs *regs)
siginfo_t info;
int signo, code;
- if (regs->ps == 0) {
+ if ((regs->ps & ~IPL_MAX) == 0) {
if (type == 1) {
const unsigned int *data
= (const unsigned int *) regs->pc;