diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-07-30 20:42:35 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-07-30 20:42:35 +0000 |
| commit | 2a479a39b14f523c2d6621427cff83105e8b0933 (patch) | |
| tree | 703c5daff4cbf273a36d5cc407333a241c998c7a /sys/arch/amd64 | |
| parent | 5a26b2b035ed6b11b66dacedbfdec7ad0fa5e1fe (diff) | |
Or in the CPUID_NXE bit from ci->ci_feature_eflags into ci->ci_feature_flags
to mimic what is done in locore.S. Otherwise we lose the CPUID_NXE bit.
ok matthew@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/identcpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c index a6eb14ee480..2c7ea64838e 100644 --- a/sys/arch/amd64/amd64/identcpu.c +++ b/sys/arch/amd64/amd64/identcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identcpu.c,v 1.48 2013/06/04 15:29:16 haesbaert Exp $ */ +/* $OpenBSD: identcpu.c,v 1.49 2013/07/30 20:42:34 kettenis Exp $ */ /* $NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /* @@ -395,6 +395,8 @@ identifycpu(struct cpu_info *ci) CPUID(0x80000001, dummy, dummy, ecx, ci->ci_feature_eflags); + /* Other bits may clash */ + ci->ci_feature_flags |= (ci->ci_feature_eflags & CPUID_NXE); if (ci->ci_flags & CPUF_PRIMARY) ecpu_ecxfeature = ecx; /* Let cpu_fature be the common bits */ |