Module Name: src
Committed By: ad
Date: Thu Mar 26 19:23:19 UTC 2020
Modified Files:
src/sys/kern: subr_cpu.c
Log Message:
Don't overwrite ci_is_slow if it has explicitly been set. Changed for
correctness, should have no impact.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/kern/subr_cpu.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/kern/subr_cpu.c
diff -u src/sys/kern/subr_cpu.c:1.13 src/sys/kern/subr_cpu.c:1.14
--- src/sys/kern/subr_cpu.c:1.13 Sat Feb 15 07:20:40 2020
+++ src/sys/kern/subr_cpu.c Thu Mar 26 19:23:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cpu.c,v 1.13 2020/02/15 07:20:40 skrll Exp $ */
+/* $NetBSD: subr_cpu.c,v 1.14 2020/03/26 19:23:18 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019, 2020
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.13 2020/02/15 07:20:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.14 2020/03/26 19:23:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -151,7 +151,6 @@ cpu_topology_set(struct cpu_info *ci, u_
ci->ci_core_id = core_id;
ci->ci_smt_id = smt_id;
ci->ci_numa_id = numa_id;
- ci->ci_is_slow = false;
for (rel = 0; rel < __arraycount(ci->ci_sibling); rel++) {
ci->ci_sibling[rel] = ci;
ci->ci_nsibling[rel] = 1;
@@ -246,8 +245,9 @@ cpu_topology_fake1(struct cpu_info *ci)
ci->ci_schedstate.spc_flags |=
(SPCF_CORE1ST | SPCF_PACKAGE1ST | SPCF_1STCLASS);
ci->ci_package1st = ci;
- ci->ci_is_slow = false;
- cpu_topology_haveslow = false;
+ if (!cpu_topology_haveslow) {
+ ci->ci_is_slow = false;
+ }
}
/*
