summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/trap.c b/trap.c
index daee22f..6651f8e 100644
--- a/trap.c
+++ b/trap.c
@@ -59,6 +59,9 @@ trap(struct trapframe *tf)
ideintr();
lapiceoi();
break;
+ case T_IRQ0 + IRQ_IDE+1:
+ // Bochs generates spurious IDE1 interrupts.
+ break;
case T_IRQ0 + IRQ_KBD:
kbdintr();
lapiceoi();
@@ -83,9 +86,10 @@ trap(struct trapframe *tf)
panic("trap");
}
// In user space, assume process misbehaved.
- cprintf("pid %d %s: trap %d err %d on cpu %d eip 0x%x addr 0x%x--kill proc\n",
+ cprintf("pid %d %s: trap %d err %d on cpu %d "
+ "eip 0x%x addr 0x%x--kill proc\n",
proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip,
- rcr2());
+ rcr2());
proc->killed = 1;
}