View | Details | Raw Unified | Return to bug 186061 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/src/sys/i386/i386/pmap.c (-5 / +5 lines)
Lines 752-763 Link Here
752
	pv_entry_high_water = 9 * (pv_entry_max / 10);
752
	pv_entry_high_water = 9 * (pv_entry_max / 10);
753
753
754
	/*
754
	/*
755
	 * If the kernel is running in a virtual machine on an AMD Family 10h
755
	 * If the kernel is running in a virtual machine on any processor
756
	 * processor, then it must assume that MCA is enabled by the virtual
756
	 * family, then it must assume that MCA is enabled by the virtual
757
	 * machine monitor.
757
	 * machine monitor and the vm may migrate to an AMD Family 10h
758
	 * processor.
758
	 */
759
	 */
759
	if (vm_guest == VM_GUEST_VM && cpu_vendor_id == CPU_VENDOR_AMD &&
760
	if (vm_guest != VM_GUEST_NO)
760
	    CPUID_TO_FAMILY(cpu_id) == 0x10)
761
		workaround_erratum383 = 1;
761
		workaround_erratum383 = 1;
762
762
763
	/*
763
	/*
(-)/usr/src/sys/amd64/amd64/pmap.c (-5 / +5 lines)
Lines 1005-1016 Link Here
1005
	}
1005
	}
1006
1006
1007
	/*
1007
	/*
1008
	 * If the kernel is running in a virtual machine on an AMD Family 10h
1008
	 * If the kernel is running in a virtual machine on any processor
1009
	 * processor, then it must assume that MCA is enabled by the virtual
1009
	 * family, then it must assume that MCA is enabled by the virtual
1010
	 * machine monitor.
1010
	 * machine monitor and the vm may migrate to an AMD Family 10h
1011
	 * processor.
1011
	 */
1012
	 */
1012
	if (vm_guest == VM_GUEST_VM && cpu_vendor_id == CPU_VENDOR_AMD &&
1013
	if (vm_guest != VM_GUEST_NO)
1013
	    CPUID_TO_FAMILY(cpu_id) == 0x10)
1014
		workaround_erratum383 = 1;
1014
		workaround_erratum383 = 1;
1015
1015
1016
	/*
1016
	/*

Return to bug 186061