diff --git a/arch/x86_64/irq.c b/arch/x86_64/irq.c
index 928e9da..f23d715 100644
--- a/arch/x86_64/irq.c
+++ b/arch/x86_64/irq.c
@@ -91,14 +91,12 @@ static void gpf_handler(struct cpu_context *regs)
 	int table = (regs->err_no >> 1) & 2;
 	int index = (regs->err_no >> 3) & 13;
 
-	printk("general protection fault (%08x %08x %08x %016llx)", ext, table, index, regs->rip);
-	ml_halt_cpu();
+	panic_irq(regs, "general protection fault (%08x %08x %08x %016llx)", ext, table, index, regs->rip);
 }
 
 static void pf_handler(struct cpu_context *regs)
 {
 	panic_irq(regs, "page fault (%016llx %016llx %016llx)", pf_faultptr(), regs->rip, regs->err_no);
-	ml_halt_cpu();
 }
 
 #if 0