svn commit: r188202 - in projects/releng_7_xen/sys: dev/xen/netfront i386/i386

[Kip Macy]

Author: kmacy
Date: Thu Feb  5 21:47:40 2009
New Revision: 188202
URL: http://svn.freebsd.org/changeset/base/188202

Log:
  - change reboot
  - make netfront compile without witness

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

Modified: projects/releng_7_xen/sys/dev/xen/netfront/netfront.c
==============================================================================
--- projects/releng_7_xen/sys/dev/xen/netfront/netfront.c	Thu Feb  5 21:45:12 2009	(r188201)
+++ projects/releng_7_xen/sys/dev/xen/netfront/netfront.c	Thu Feb  5 21:47:40 2009	(r188202)
@@ -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/releng_7_xen/sys/i386/i386/vm_machdep.c
==============================================================================
--- projects/releng_7_xen/sys/i386/i386/vm_machdep.c	Thu Feb  5 21:45:12 2009	(r188201)
+++ projects/releng_7_xen/sys/i386/i386/vm_machdep.c	Thu Feb  5 21:47:40 2009	(r188202)
@@ -629,7 +629,10 @@ cpu_reset_real()
 
 	disable_intr();
 #ifdef XEN
-	HYPERVISOR_shutdown(SHUTDOWN_poweroff);
+	if (smp_processor_id() == 0)
+		HYPERVISOR_shutdown(SHUTDOWN_reboot);
+	else
+		HYPERVISOR_shutdown(SHUTDOWN_poweroff);
 #endif
 #ifdef CPU_ELAN
 	if (elan_mmcr != NULL)