summaryrefslogtreecommitdiffstats
path: root/sys/alpha
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2000-09-13 18:21:33 +0000
committerjhb <jhb@FreeBSD.org>2000-09-13 18:21:33 +0000
commitb563a12289dac9d95d3d3590a4f228cad690e195 (patch)
tree0c94a3346d7d53d668c058d5790a77bbab97a0ab /sys/alpha
parentb67788a71fcb672865141b1d73aa0f5f6faa0f6c (diff)
downloadFreeBSD-src-b563a12289dac9d95d3d3590a4f228cad690e195.zip
FreeBSD-src-b563a12289dac9d95d3d3590a4f228cad690e195.tar.gz
Add back in obtaining/releasing Giant around interrupt handlers.
Diffstat (limited to 'sys/alpha')
-rw-r--r--sys/alpha/alpha/interrupt.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index ef1c708..cb796c6 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -93,6 +93,7 @@ interrupt(a0, a1, a2, framep)
struct proc* p = curproc;
if (!p) p = &proc0;
if ((caddr_t) framep < (caddr_t) p->p_addr + 1024) {
+ mtx_enter(&Giant, MTX_DEF);
panic("possible stack overflow\n");
}
}
@@ -113,6 +114,7 @@ interrupt(a0, a1, a2, framep)
return;
}
+ mtx_enter(&Giant, MTX_DEF);
cnt.v_intr++;
#ifdef EVCNT_COUNTERS
clock_intr_evcnt.ev_count++;
@@ -125,24 +127,31 @@ interrupt(a0, a1, a2, framep)
if((++schedclk2 & 0x7) == 0)
statclock((struct clockframe *)framep);
}
+ mtx_exit(&Giant, MTX_DEF);
break;
case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */
+ mtx_enter(&Giant, MTX_DEF);
a0 = alpha_pal_rdmces();
if (platform.mcheck_handler)
(*platform.mcheck_handler)(a0, framep, a1, a2);
else
machine_check(a0, framep, a1, a2);
+ mtx_exit(&Giant, MTX_DEF);
break;
case ALPHA_INTR_DEVICE: /* I/O device interrupt */
+ mtx_enter(&Giant, MTX_DEF);
cnt.v_intr++;
if (platform.iointr)
(*platform.iointr)(framep, a1);
+ mtx_exit(&Giant, MTX_DEF);
break;
case ALPHA_INTR_PERF: /* interprocessor interrupt */
+ mtx_enter(&Giant, MTX_DEF);
perf_irq(a1, framep);
+ mtx_exit(&Giant, MTX_DEF);
break;
case ALPHA_INTR_PASSIVE:
@@ -152,6 +161,7 @@ interrupt(a0, a1, a2, framep)
break;
default:
+ mtx_enter(&Giant, MTX_DEF);
panic("unexpected interrupt: type 0x%lx vec 0x%lx a2 0x%lx\n",
a0, a1, a2);
/* NOTREACHED */
OpenPOWER on IntegriCloud