Module Name:    src
Committed By:   mrg
Date:           Sun Apr 21 21:52:10 UTC 2019

Modified Files:
        src/sys/dev/acpi: acpi_tz.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/acpi/acpi_tz.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/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.89 src/sys/dev/acpi/acpi_tz.c:1.90
--- src/sys/dev/acpi/acpi_tz.c:1.89	Thu Jun  1 02:45:09 2017
+++ src/sys/dev/acpi/acpi_tz.c	Sun Apr 21 21:52:09 2019
@@ -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 <[email protected]>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 
 #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 @@ acpitz_print_processor_list(device_t dv)
 		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;

Reply via email to