From owner-svn-src-projects@FreeBSD.ORG  Sun Feb  8 23:12:29 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BBD15106566B;
	Sun,  8 Feb 2009 23:12:29 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AAA2C8FC0A;
	Sun,  8 Feb 2009 23:12:29 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n18NCTeb037753;
	Sun, 8 Feb 2009 23:12:29 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n18NCTc4037751;
	Sun, 8 Feb 2009 23:12:29 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200902082312.n18NCTc4037751@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 8 Feb 2009 23:12:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188351 - in projects/release_6_3_xen/sys:
	dev/xen/netfront i386/i386
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2009 23:12:30 -0000

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