Module Name: src
Committed By: mrg
Date: Fri Aug 30 07:53:47 UTC 2019
Modified Files:
src/sys/arch/x86/x86: cpu.c
Log Message:
avoid misalignment in 32 bit kernels and "mach cpu".
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/x86/x86/cpu.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/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.171 src/sys/arch/x86/x86/cpu.c:1.172
--- src/sys/arch/x86/x86/cpu.c:1.171 Wed May 29 16:54:41 2019
+++ src/sys/arch/x86/x86/cpu.c Fri Aug 30 07:53:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.171 2019/05/29 16:54:41 maxv Exp $ */
+/* $NetBSD: cpu.c,v 1.172 2019/08/30 07:53:47 mrg Exp $ */
/*
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.171 2019/05/29 16:54:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.172 2019/08/30 07:53:47 mrg Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -979,8 +979,14 @@ cpu_debug_dump(void)
{
struct cpu_info *ci;
CPU_INFO_ITERATOR cii;
+ const char sixtyfour64space[] =
+#ifdef _LP64
+ " "
+#endif
+ "";
- db_printf("addr dev id flags ipis curlwp fpcurlwp\n");
+ db_printf("addr %sdev id flags ipis curlwp "
+ "fpcurlwp\n", sixtyfour64space);
for (CPU_INFO_FOREACH(cii, ci)) {
db_printf("%p %s %ld %x %x %10p %10p\n",
ci,
