Module Name: src
Committed By: ad
Date: Sat Dec 21 12:53:54 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/x86/x86: identcpu.c
src/sys/kern: subr_cpu.c
src/sys/sys: cpu.h
Log Message:
Fix build break (ci->ci_dev is not available on every port).
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_cpu.c
cvs rdiff -u -r1.46 -r1.47 src/sys/sys/cpu.h
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/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.27 src/sys/arch/aarch64/aarch64/cpu.c:1.28
--- src/sys/arch/aarch64/aarch64/cpu.c:1.27 Fri Dec 20 21:05:33 2019
+++ src/sys/arch/aarch64/aarch64/cpu.c Sat Dec 21 12:53:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.27 2019/12/20 21:05:33 ad Exp $ */
+/* $NetBSD: cpu.c,v 1.28 2019/12/21 12:53:54 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.27 2019/12/20 21:05:33 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.28 2019/12/21 12:53:54 ad Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -230,7 +230,8 @@ cpu_identify(device_t self, struct cpu_i
aprint_naive("\n");
aprint_normal(": %s\n", model);
- cpu_topology_print(ci);
+ aprint_normal_dev(ci->ci_dev, "package %u, core %u, smt %u\n",
+ ci->ci_package_id, ci->ci_core_id, ci->ci_smt_id);
}
static void
Index: src/sys/arch/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.99 src/sys/arch/x86/x86/identcpu.c:1.100
--- src/sys/arch/x86/x86/identcpu.c:1.99 Fri Dec 20 21:05:34 2019
+++ src/sys/arch/x86/x86/identcpu.c Sat Dec 21 12:53:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.99 2019/12/20 21:05:34 ad Exp $ */
+/* $NetBSD: identcpu.c,v 1.100 2019/12/21 12:53:54 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.99 2019/12/20 21:05:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.100 2019/12/21 12:53:54 ad Exp $");
#include "opt_xen.h"
@@ -1002,7 +1002,8 @@ cpu_identify(struct cpu_info *ci)
if (ci->ci_signature != 0)
aprint_normal(", id 0x%x", ci->ci_signature);
aprint_normal("\n");
- cpu_topology_print(ci);
+ aprint_normal_dev(ci->ci_dev, "node %u, package %u, core %u, smt %u\n",
+ ci->ci_numa_id, ci->ci_package_id, ci->ci_core_id, ci->ci_smt_id);
if (cpu_brand_string[0] == '\0') {
strlcpy(cpu_brand_string, cpu_getmodel(),
sizeof(cpu_brand_string));
Index: src/sys/kern/subr_cpu.c
diff -u src/sys/kern/subr_cpu.c:1.2 src/sys/kern/subr_cpu.c:1.3
--- src/sys/kern/subr_cpu.c:1.2 Sat Dec 21 11:35:25 2019
+++ src/sys/kern/subr_cpu.c Sat Dec 21 12:53:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cpu.c,v 1.2 2019/12/21 11:35:25 ad Exp $ */
+/* $NetBSD: subr_cpu.c,v 1.3 2019/12/21 12:53:53 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.2 2019/12/21 11:35:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.3 2019/12/21 12:53:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -350,17 +350,6 @@ cpu_topology_init(void)
}
/*
- * Print basic topology info.
- */
-void
-cpu_topology_print(struct cpu_info *ci)
-{
-
- aprint_normal_dev(ci->ci_dev, "numa %u, package %u, core %u, smt %u\n",
- ci->ci_numa_id, ci->ci_package_id, ci->ci_core_id, ci->ci_smt_id);
-}
-
-/*
* Adjust one count, for a counter that's NOT updated from interrupt
* context. Hardly worth making an inline due to preemption stuff.
*/
Index: src/sys/sys/cpu.h
diff -u src/sys/sys/cpu.h:1.46 src/sys/sys/cpu.h:1.47
--- src/sys/sys/cpu.h:1.46 Fri Dec 20 21:05:34 2019
+++ src/sys/sys/cpu.h Sat Dec 21 12:53:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.46 2019/12/20 21:05:34 ad Exp $ */
+/* $NetBSD: cpu.h,v 1.47 2019/12/21 12:53:53 ad Exp $ */
/*-
* Copyright (c) 2007 YAMAMOTO Takashi,
@@ -92,7 +92,6 @@ void cpu_intr_redistribute(void);
u_int cpu_intr_count(struct cpu_info *);
void cpu_topology_set(struct cpu_info *, u_int, u_int, u_int, u_int);
void cpu_topology_init(void);
-void cpu_topology_print(struct cpu_info *);
#endif
#ifdef _KERNEL
