[src/netbsd-9]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1a8c268f6de
branches:  netbsd-9
changeset: 963906:f1a8c268f6de
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 25 15:39:54 2020 +0000

description:
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.

diffstat:

 sys/arch/x86/x86/cpu_topology.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r efc7cfdff85c -r f1a8c268f6de sys/arch/x86/x86/cpu_topology.c
--- a/sys/arch/x86/x86/cpu_topology.c   Mon May 25 15:31:45 2020 +0000
+++ b/sys/arch/x86/x86/cpu_topology.c   Mon May 25 15:39:54 2020 +0000
@@ -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_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;
        }