svn commit: r237711 - in projects/amd64_xen_pv/sys: amd64/xen dev/xen/control

[Cherry G. Mathew]

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;
 	/*