diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2017-01-18 08:38:35 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2017-01-18 08:38:35 +0000 |
| commit | fe60d8c08aa9ffc18f3dd54b0eae9bba40049f18 (patch) | |
| tree | 01abdb4664d8e2f56b682c3a837b25b550b71d3a /sys | |
| parent | ff228505396f2f11949b5aef6d8c18ea8ad3985c (diff) | |
i386 version of a fix that went in for amd64 previously
(cpuid cacheline size info)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/vmm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/vmm.c b/sys/arch/i386/i386/vmm.c index 333fdbb6ef2..c219addede9 100644 --- a/sys/arch/i386/i386/vmm.c +++ b/sys/arch/i386/i386/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.13 2017/01/13 02:38:41 mlarkin Exp $ */ +/* $OpenBSD: vmm.c,v 1.14 2017/01/18 08:38:34 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -3835,7 +3835,7 @@ vmx_handle_cpuid(struct vcpu *vcpu) *eax = cpu_id; /* mask off host's APIC ID, reset to vcpu id */ *ebx = cpu_miscinfo & 0x00FFFFFF; - *ebx &= (vcpu->vc_id & 0xFF) << 24; + *ebx |= (vcpu->vc_id & 0xFF) << 24; /* * clone host capabilities minus: * debug store (CPUIDECX_DTES64, CPUIDECX_DSCPL, CPUID_DS) |