From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 28 13:47:08 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 063311065677;
	Thu, 28 Jun 2012 13:47:08 +0000 (UTC)
	(envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E5E118FC14;
	Thu, 28 Jun 2012 13:47:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5SDl74H079427;
	Thu, 28 Jun 2012 13:47:07 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5SDl79x079424;
	Thu, 28 Jun 2012 13:47:07 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201206281347.q5SDl79x079424@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Thu, 28 Jun 2012 13:47:07 +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: r237711 - in projects/amd64_xen_pv/sys: amd64/xen
	dev/xen/control
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: Thu, 28 Jun 2012 13:47:08 -0000

Author: cherry
Date: Thu Jun 28 13:47:07 2012
New Revision: 237711
URL: http://svn.freebsd.org/changeset/base/237711

Log:
  Allow non-SMP builds for amd64/xen
  
  Approved by:	gibbs (implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/mm.c
  projects/amd64_xen_pv/sys/dev/xen/control/control.c

Modified: projects/amd64_xen_pv/sys/amd64/xen/mm.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/mm.c	Thu Jun 28 13:12:34 2012	(r237710)
+++ projects/amd64_xen_pv/sys/amd64/xen/mm.c	Thu Jun 28 13:47:07 2012	(r237711)
@@ -52,9 +52,11 @@ static mmu_update_t xpq_queue[MAX_VIRT_C
 #define	XPQ_IDX xpq_idx[vcpu]
 #define	SET_VCPU() int vcpu = smp_processor_id()
 #else
-	
-static mmu_update_t xpq_queue[XPQUEUE_SIZE];
+#ifdef INVARIANTS	
 static struct mmu_log xpq_queue_log[XPQUEUE_SIZE];
+#endif
+
+static mmu_update_t xpq_queue[XPQUEUE_SIZE];
 static int xpq_idx = 0;
 
 #define	XPQ_QUEUE_LOG xpq_queue_log

Modified: projects/amd64_xen_pv/sys/dev/xen/control/control.c
==============================================================================
--- projects/amd64_xen_pv/sys/dev/xen/control/control.c	Thu Jun 28 13:12:34 2012	(r237710)
+++ projects/amd64_xen_pv/sys/dev/xen/control/control.c	Thu Jun 28 13:47:07 2012	(r237711)
@@ -201,13 +201,13 @@ extern void xencons_resume(void);
 static void
 xctrl_suspend()
 {
-	u_int cpuid;
 	int i, j, k, fpp;
 	unsigned long max_pfn, start_info_mfn;
 
 	EVENTHANDLER_INVOKE(power_suspend);
 
 #ifdef SMP
+	u_int cpuid;
 	struct thread *td;
 	cpuset_t map;
 	/*