diff options
| author |   sthen <sthen@openbsd.org> | 2018-06-28 21:28:41 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2018-06-28 21:28:41 +0000 |
| commit | f4828eb5ee410d361b0e2728f8e50f9af712dc41 (patch) | |
| tree | 897a4b2b08f2fd9477fb7d46a1e7e6eda574f6c8 | |
| parent | Add ci_acpi_proc_id member to struct cpu_info; needed by acpi(4). (diff) | |
| download | wireguard-openbsd-f4828eb5ee410d361b0e2728f8e50f9af712dc41.tar.xz wireguard-openbsd-f4828eb5ee410d361b0e2728f8e50f9af712dc41.zip | |
remove accidentally committed test code, spotted by deraadt
| -rw-r--r-- | sys/arch/amd64/amd64/identcpu.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c index bbe1c118ac6..f0711067798 100644 --- a/sys/arch/amd64/amd64/identcpu.c +++ b/sys/arch/amd64/amd64/identcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identcpu.c,v 1.97 2018/06/20 19:30:34 sthen Exp $ */ +/* $OpenBSD: identcpu.c,v 1.98 2018/06/28 21:28:41 sthen Exp $ */ /* $NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /* @@ -842,15 +842,9 @@ cpu_topology(struct cpu_info *ci) pkg_bits = core_bits + smt_bits; pkg_mask = -1 << core_bits; - // ci->ci_smt_id = apicid & smt_mask; + ci->ci_smt_id = apicid & smt_mask; ci->ci_core_id = (apicid & core_mask) >> smt_bits; ci->ci_pkg_id = (apicid & pkg_mask) >> pkg_bits; - ci->ci_smt_id = 0; - CPU_INFO_FOREACH(cii, ci_other) { - if (ci != ci_other && - ci_other->ci_core_id == ci->ci_core_id) - ci->ci_smt_id++; - } } else goto no_topology; #ifdef DEBUG |