Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi use cpu_name() on a struct cpu_info *. don't a...



details:   https://anonhg.NetBSD.org/src/rev/204c5328b518
branches:  trunk
changeset: 456072:204c5328b518
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Apr 21 21:52:09 2019 +0000

description:
use cpu_name() on a struct cpu_info *.  don't assume it has a ci_dev
member that is valid input to device_xname().

fixes build on arm64.

diffstat:

 sys/dev/acpi/acpi_tz.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r c050af86dfeb -r 204c5328b518 sys/dev/acpi/acpi_tz.c
--- a/sys/dev/acpi/acpi_tz.c    Sun Apr 21 15:57:33 2019 +0000
+++ b/sys/dev/acpi/acpi_tz.c    Sun Apr 21 21:52:09 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.89 2017/06/01 02:45:09 chs Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.90 2019/04/21 21:52:09 mrg Exp $ */
 
 /*
  * Copyright (c) 2003 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.89 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.90 2019/04/21 21:52:09 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -39,6 +39,7 @@
 #include <sys/module.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
+#include <sys/cpu.h>
 
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
@@ -748,7 +749,7 @@
                if (cnt == 0)
                        aprint_normal(":");
 
-               aprint_normal(" %s", device_xname(ci->ci_dev));
+               aprint_normal(" %s", cpu_name(ci));
 
                sc->sc_psl[cnt] = ci;
                ++cnt;



Home | Main Index | Thread Index | Old Index