--- src/sys/platform/vkernel/i386/trap.c	2007/06/29 21:54:11	1.25
+++ src/sys/platform/vkernel/i386/trap.c	2007/07/01 01:11:36	1.26
@@ -551,7 +551,7 @@ restart:
 		 * saved FP state that the (emulated) virtual kernel
 		 * needs to hand over to a different emulated process.
 		 */
-		if (lp->lwp_ve &&
+		if (lp->lwp_vkernel && lp->lwp_vkernel->ve &&
 		    (td->td_pcb->pcb_flags & FP_VIRTFP)
 		) {
 			npxdna(frame);
@@ -598,7 +598,7 @@ restart:
 	 * VM context managed by a virtual kernel then let the virtual kernel
 	 * handle it.
 	 */
-	if (lp->lwp_ve) {
+	if (lp->lwp_vkernel && lp->lwp_vkernel->ve) {
 		vkernel_trap(lp, frame);
 		goto out;
 	}
@@ -952,7 +952,7 @@ trap_fatal(struct trapframe *frame, int
 #ifdef SMP
 	/* two separate prints in case of a trap on an unmapped page */
 	kprintf("mp_lock = %08x; ", mp_lock);
-	kprintf("cpuid = %d; ", mycpu->gd_cpuid);
+	kprintf("cpuid = %d\n", mycpu->gd_cpuid);
 #endif
 	if (type == T_PAGEFLT) {
 		kprintf("fault virtual address	= 0x%x\n", eva);
@@ -1047,7 +1047,7 @@ dblfault_handler(void)
 #ifdef SMP
 	/* two separate prints in case of a trap on an unmapped page */
 	kprintf("mp_lock = %08x; ", mp_lock);
-	kprintf("cpuid = %d; ", mycpu->gd_cpuid);
+	kprintf("cpuid = %d\n", mycpu->gd_cpuid);
 #endif
 	panic("double fault");
 }
@@ -1151,7 +1151,7 @@ syscall2(struct trapframe *frame)
 	 * Restore the virtual kernel context and return from its system
 	 * call.  The current frame is copied out to the virtual kernel.
 	 */
-	if (lp->lwp_ve) {
+	if (lp->lwp_vkernel && lp->lwp_vkernel->ve) {
 		error = vkernel_trap(lp, frame);
 		frame->tf_eax = error;
 		if (error)