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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
