[src/trunk]: src/sys Fix build break (ci->ci_dev is not available on every po...

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

details:   https://anonhg.NetBSD.org/src/rev/6e4d33c98ab6
branches:  trunk
changeset: 847396:6e4d33c98ab6
user:      ad <ad%NetBSD.org@localhost>
date:      Sat Dec 21 12:53:53 2019 +0000

description:
Fix build break (ci->ci_dev is not available on every port).

diffstat:

 sys/arch/aarch64/aarch64/cpu.c |   7 ++++---
 sys/arch/x86/x86/identcpu.c    |   7 ++++---
 sys/kern/subr_cpu.c            |  15 ++-------------
 sys/sys/cpu.h                  |   3 +--
 4 files changed, 11 insertions(+), 21 deletions(-)

diffs (109 lines):

diff -r 7be708a331a8 -r 6e4d33c98ab6 sys/arch/aarch64/aarch64/cpu.c
--- a/sys/arch/aarch64/aarch64/cpu.c    Sat Dec 21 11:59:03 2019 +0000
+++ b/sys/arch/aarch64/aarch64/cpu.c    Sat Dec 21 12:53:53 2019 +0000
@@ -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 <ryo%nerv.org@localhost>
@@ -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 @@
 
        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
diff -r 7be708a331a8 -r 6e4d33c98ab6 sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Sat Dec 21 11:59:03 2019 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Sat Dec 21 12:53:53 2019 +0000
@@ -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 @@
        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));
diff -r 7be708a331a8 -r 6e4d33c98ab6 sys/kern/subr_cpu.c
--- a/sys/kern/subr_cpu.c       Sat Dec 21 11:59:03 2019 +0000
+++ b/sys/kern/subr_cpu.c       Sat Dec 21 12:53:53 2019 +0000
@@ -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 @@
 }
 
 /*
- * 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.
  */
diff -r 7be708a331a8 -r 6e4d33c98ab6 sys/sys/cpu.h
--- a/sys/sys/cpu.h     Sat Dec 21 11:59:03 2019 +0000
+++ b/sys/sys/cpu.h     Sat Dec 21 12:53:53 2019 +0000
@@ -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 @@
 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