Source-Changes-HG archive

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

[src/trunk]: src/sys/kern Fix previous to make it compile again.



details:   https://anonhg.NetBSD.org/src/rev/3e0fa844f1eb
branches:  trunk
changeset: 369773:3e0fa844f1eb
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Aug 31 05:24:41 2022 +0000

description:
Fix previous to make it compile again.

diffstat:

 sys/kern/subr_lockdebug.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r 4cf9ca7d9110 -r 3e0fa844f1eb sys/kern/subr_lockdebug.c
--- a/sys/kern/subr_lockdebug.c Tue Aug 30 22:38:26 2022 +0000
+++ b/sys/kern/subr_lockdebug.c Wed Aug 31 05:24:41 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_lockdebug.c,v 1.81 2022/08/30 22:38:17 riastradh Exp $    */
+/*     $NetBSD: subr_lockdebug.c,v 1.82 2022/08/31 05:24:41 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.81 2022/08/30 22:38:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.82 2022/08/31 05:24:41 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -56,6 +56,13 @@
 
 #include <machine/lock.h>
 
+#ifdef DDB
+#include <machine/db_machdep.h>
+#include <ddb/db_interface.h>
+#include <ddb/db_access.h>
+#include <ddb/db_sym.h>
+#endif
+
 unsigned int           ld_panic;
 
 #ifdef LOCKDEBUG
@@ -708,13 +715,6 @@
 }
 #endif /* _KERNEL */
 
-#ifdef DDB
-#include <machine/db_machdep.h>
-#include <ddb/db_interface.h>
-#include <ddb/db_access.h>
-#include <ddb/db_sym.h>
-#endif
-
 /*
  * lockdebug_dump:
  *
@@ -856,8 +856,8 @@
 
        (*pr)("WARNING: lock print is unreliable without LOCKDEBUG\n");
        db_symstr(sym, sizeof(sym), (db_expr_t)addr, DB_STGY_ANY);
-       db_read_bytes((db_addr_t)addr, sizeof(word), &word);
-       (*pr)("%s: possible owner: %p, bits: 0x%x\n", sym,
+       db_read_bytes((db_addr_t)addr, sizeof(word), (char *)&word);
+       (*pr)("%s: possible owner: %p, bits: 0x%" PRIxPTR "\n", sym,
            (void *)(word & ~(uintptr_t)ALIGNBYTES), word & ALIGNBYTES);
 #endif /* LOCKDEBUG */
 }



Home | Main Index | Thread Index | Old Index