Module Name: src
Committed By: martin
Date: Sun Nov 18 19:39:50 UTC 2018
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: procfs_machdep.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.3 -r1.6.4.4 src/sys/arch/x86/x86/procfs_machdep.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/arch/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.3 src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.4
--- src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.3 Mon Sep 11 05:50:12 2017
+++ src/sys/arch/x86/x86/procfs_machdep.c Sun Nov 18 19:39:49 2018
@@ -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 @@ procfs_getonecpu(int xcpu, struct cpu_in
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;
