Module Name: src
Committed By: martin
Date: Mon May 25 15:39:54 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: cpu_topology.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #922):
sys/arch/x86/x86/cpu_topology.c: revision 1.18
assert smt_bits value only after it is computed.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/arch/x86/x86/cpu_topology.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/cpu_topology.c
diff -u src/sys/arch/x86/x86/cpu_topology.c:1.14 src/sys/arch/x86/x86/cpu_topology.c:1.14.4.1
--- src/sys/arch/x86/x86/cpu_topology.c:1.14 Wed Nov 21 10:34:53 2018
+++ src/sys/arch/x86/x86/cpu_topology.c Mon May 25 15:39:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_topology.c,v 1.14 2018/11/21 10:34:53 msaitoh Exp $ */
+/* $NetBSD: cpu_topology.c,v 1.14.4.1 2020/05/25 15:39:54 martin Exp $ */
/*-
* Copyright (c) 2009 Mindaugas Rasiukevicius <rmind at NetBSD org>,
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.14 2018/11/21 10:34:53 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.14.4.1 2020/05/25 15:39:54 martin Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -157,8 +157,9 @@ x86_cpu_topology(struct cpu_info *ci)
x86_cpuid(0x8000001e, descs);
const u_int threads = ((descs[1] >> 8) & 0xff) + 1;
- KASSERT(smt_bits == 0 && smt_bits <= core_bits);
+ KASSERT(smt_bits == 0);
smt_bits = ilog2(threads);
+ KASSERT(smt_bits <= core_bits);
core_bits -= smt_bits;
}
