svn commit: r188351 - in projects/release_6_3_xen/sys: dev/xen/netfront i386/i386

[Kip Macy]

Author: kmacy
Date: Sun Feb  8 23:12:29 2009
New Revision: 188351
URL: http://svn.freebsd.org/changeset/base/188351

Log:
  fixing netfront build without witness and reboot handling

Modified:
  projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c
  projects/release_6_3_xen/sys/i386/i386/vm_machdep.c

Modified: projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c
==============================================================================
--- projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c	Sun Feb  8 22:54:58 2009	(r188350)
+++ projects/release_6_3_xen/sys/dev/xen/netfront/netfront.c	Sun Feb  8 23:12:29 2009	(r188351)
@@ -24,6 +24,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>

Modified: projects/release_6_3_xen/sys/i386/i386/vm_machdep.c
==============================================================================
--- projects/release_6_3_xen/sys/i386/i386/vm_machdep.c	Sun Feb  8 22:54:58 2009	(r188350)
+++ projects/release_6_3_xen/sys/i386/i386/vm_machdep.c	Sun Feb  8 23:12:29 2009	(r188351)
@@ -597,7 +597,10 @@ cpu_reset_real()
 #endif
 
 #ifdef XEN
-	HYPERVISOR_shutdown(SHUTDOWN_poweroff);
+	if (smp_processor_id() == 0)
+		HYPERVISOR_shutdown(SHUTDOWN_reboot);
+	else
+		HYPERVISOR_shutdown(SHUTDOWN_poweroff);
 #endif	
 	disable_intr();
 #ifdef CPU_ELAN