diff options
| author |   kettenis <kettenis@openbsd.org> | 2013-07-30 20:42:34 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2013-07-30 20:42:34 +0000 |
| commit | 0b01906b2029b3218dc0f73085e53d8459e78ecb (patch) | |
| tree | ab1e3218b93834e291e0938ab5ac5b620e72f032 | |
| parent | Fix attribute((init_priority)) on sparc and sparc64. (diff) | |
| download | wireguard-openbsd-0b01906b2029b3218dc0f73085e53d8459e78ecb.tar.xz wireguard-openbsd-0b01906b2029b3218dc0f73085e53d8459e78ecb.zip | |
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@
| -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 */ |