Index: arch/ia32/src/interrupt.c
===================================================================
--- arch/ia32/src/interrupt.c	(revision 74df77d86a72a4f024333efb0598dc08924798b8)
+++ arch/ia32/src/interrupt.c	(revision b60a22c46e392bc508919c7fe80729aa7c60cee7)
@@ -116,6 +116,5 @@
 	printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
 	printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
-	printf("page fault\n");
-	cpu_halt();
+	panic("page fault\n");
 }
 
Index: arch/ia32/src/smp/ap.S
===================================================================
--- arch/ia32/src/smp/ap.S	(revision 74df77d86a72a4f024333efb0598dc08924798b8)
+++ arch/ia32/src/smp/ap.S	(revision b60a22c46e392bc508919c7fe80729aa7c60cee7)
@@ -70,5 +70,5 @@
 	call map_kernel
 
-	ljmp $KTEXT,$main_ap
+	jmpl $KTEXT,$main_ap
 
 #endif /* __SMP__ */
Index: arch/ia32/src/smp/apic.c
===================================================================
--- arch/ia32/src/smp/apic.c	(revision 74df77d86a72a4f024333efb0598dc08924798b8)
+++ arch/ia32/src/smp/apic.c	(revision b60a22c46e392bc508919c7fe80729aa7c60cee7)
@@ -45,5 +45,5 @@
  * Tested on:
  *	Bochs 2.0.2 - Bochs 2.2 with 2-8 CPUs
- *	Simics 2.0.28 
+ *	Simics 2.0.28 - Simics 2.2.14 2-4 CPUs
  *	ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41 with 2x 200Mhz Pentium CPUs
  */