From owner-svn-src-head@FreeBSD.ORG  Sat May  7 12:27:25 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 991CE106566C;
	Sat,  7 May 2011 12:27:25 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 899228FC13;
	Sat,  7 May 2011 12:27:25 +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 p47CRPiN098441;
	Sat, 7 May 2011 12:27:25 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p47CRPUa098439;
	Sat, 7 May 2011 12:27:25 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201105071227.p47CRPUa098439@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 7 May 2011 12:27:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221599 - head/sys/i386/i386
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 May 2011 12:27:25 -0000

Author: mav
Date: Sat May  7 12:27:25 2011
New Revision: 221599
URL: http://svn.freebsd.org/changeset/base/221599

Log:
  Don't use MWAIT for short sleeps under XEN, as it was before r212541.
  This fixes panic during boot in PV mode on Xen 3.2.

Modified:
  head/sys/i386/i386/machdep.c

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Sat May  7 11:29:48 2011	(r221598)
+++ head/sys/i386/i386/machdep.c	Sat May  7 12:27:25 2011	(r221599)
@@ -1359,6 +1359,7 @@ cpu_idle(int busy)
 	if (mp_grab_cpu_hlt())
 		return;
 #endif
+#ifndef XEN
 	/* If we are busy - try to use fast methods. */
 	if (busy) {
 		if ((cpu_feature2 & CPUID2_MON) && idle_mwait) {
@@ -1367,7 +1368,6 @@ cpu_idle(int busy)
 		}
 	}
 
-#ifndef XEN
 	/* If we have time - switch timers into idle mode. */
 	if (!busy) {
 		critical_enter();
@@ -1395,8 +1395,8 @@ cpu_idle(int busy)
 		cpu_activeclock();
 		critical_exit();
 	}
-#endif
 out:
+#endif
 	CTR2(KTR_SPARE2, "cpu_idle(%d) at %d done",
 	    busy, curcpu);
 }