[src/netbsd-7]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/ffd72b5ae094
branches:  netbsd-7
changeset: 800567:ffd72b5ae094
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 18 19:39:49 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1650):

        sys/arch/x86/x86/procfs_machdep.c: revision 1.25

- I misread ci_acpiid as ci_apicid... LAPIC ID is in ci_cpuid.
   Print it correctly.

- ci_initapicid(Initial APIC ID) is uint32_t, so use %u.

diffstat:

 sys/arch/x86/x86/procfs_machdep.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r e83c3efb8106 -r ffd72b5ae094 sys/arch/x86/x86/procfs_machdep.c
--- a/sys/arch/x86/x86/procfs_machdep.c Sun Nov 18 19:37:30 2018 +0000
+++ b/sys/arch/x86/x86/procfs_machdep.c Sun Nov 18 19:39:49 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: procfs_machdep.c,v 1.6.4.3 2017/09/11 05:50:12 snj Exp $ */
+/*     $NetBSD: procfs_machdep.c,v 1.6.4.4 2018/11/18 19:39:49 martin Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.3 2017/09/11 05:50:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.4 2018/11/18 19:39:49 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -359,9 +359,9 @@
                left = 0;
 
        l = snprintf(p, left,
-           "apicid\t\t: %d\n"
-           "initial apicid\t: %d\n",
-           ci->ci_acpiid,
+           "apicid\t\t: %lu\n"
+           "initial apicid\t: %u\n",
+           ci->ci_cpuid,
            ci->ci_initapicid
        );
        size += l;