From owner-svn-src-all@FreeBSD.ORG  Wed Jan 19 21:03:23 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 02B9E106566C;
	Wed, 19 Jan 2011 21:03:23 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E603E8FC15;
	Wed, 19 Jan 2011 21:03:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0JL3MJ7088971;
	Wed, 19 Jan 2011 21:03:22 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0JL3MRt088969;
	Wed, 19 Jan 2011 21:03:22 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201101192103.p0JL3MRt088969@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 19 Jan 2011 21:03:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217598 - releng/8.2/sys/i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jan 2011 21:03:23 -0000

Author: cperciva
Date: Wed Jan 19 21:03:22 2011
New Revision: 217598
URL: http://svn.freebsd.org/changeset/base/217598

Log:
  MFS r217408: Don't use amdc1e on XEN && !XEN_PRIVILEGED.  This fixes a
  panic when booting FreeBSD/XEN on recent AMD CPUs.
  
  Approved by:	re (bz)

Modified:
  releng/8.2/sys/i386/i386/machdep.c
Directory Properties:
  releng/8.2/sys/   (props changed)
  releng/8.2/sys/amd64/include/xen/   (props changed)
  releng/8.2/sys/cddl/contrib/opensolaris/   (props changed)
  releng/8.2/sys/contrib/dev/acpica/   (props changed)
  releng/8.2/sys/contrib/pf/   (props changed)

Modified: releng/8.2/sys/i386/i386/machdep.c
==============================================================================
--- releng/8.2/sys/i386/i386/machdep.c	Wed Jan 19 20:57:08 2011	(r217597)
+++ releng/8.2/sys/i386/i386/machdep.c	Wed Jan 19 21:03:22 2011	(r217598)
@@ -1228,6 +1228,7 @@ cpu_idle_acpi(int busy)
 
 static int cpu_ident_amdc1e = 0;
 
+#if !defined(XEN) || defined(XEN_PRIVILEGED)
 static int
 cpu_probe_amdc1e(void)
 { 
@@ -1254,6 +1255,7 @@ cpu_probe_amdc1e(void)
 #endif
 	return (0);
 }
+#endif
 
 /*
  * C1E renders the local APIC timer dead, so we disable it by
@@ -2690,8 +2692,10 @@ init386(first)
 	thread0.td_pcb->pcb_fsd = PCPU_GET(fsgs_gdt)[0];
 	thread0.td_pcb->pcb_gsd = PCPU_GET(fsgs_gdt)[1];
 
+#if defined(XEN_PRIVILEGED)
 	if (cpu_probe_amdc1e())
 		cpu_idle_fn = cpu_idle_amdc1e;
+#endif
 }
 
 #else