summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-07-06 21:47:22 +0000
committerkaashoek <kaashoek>2006-07-06 21:47:22 +0000
commit7837c71b32fc716101a859302e0349061416bd6e (patch)
tree57ec72178b980a3cd794b2f93bd021e08004368f /trap.c
parentb22d898297a2496ba4cfd31d445769fbebc0a46d (diff)
downloadxv6-labs-7837c71b32fc716101a859302e0349061416bd6e.tar.gz
xv6-labs-7837c71b32fc716101a859302e0349061416bd6e.tar.bz2
xv6-labs-7837c71b32fc716101a859302e0349061416bd6e.zip
disable all interrupts when acquiring lock
user program that makes a blocking system call
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/trap.c b/trap.c
index 0459583..6b490b1 100644
--- a/trap.c
+++ b/trap.c
@@ -60,6 +60,10 @@ trap(struct Trapframe *tf)
lapic_timerintr();
return;
}
+ if(v == (IRQ_OFFSET + IRQ_IDE)){
+ ide_intr();
+ return;
+ }
// XXX probably ought to lgdt on trap return