Module Name: src
Committed By: nakayama
Date: Fri Sep 2 06:01:38 UTC 2022
Modified Files:
src/sys/kern: subr_lockdebug.c
Log Message:
Fix "error: cast from pointer to integer of different size" on
sparc build.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/kern/subr_lockdebug.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/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.82 src/sys/kern/subr_lockdebug.c:1.83
--- src/sys/kern/subr_lockdebug.c:1.82 Wed Aug 31 05:24:41 2022
+++ src/sys/kern/subr_lockdebug.c Fri Sep 2 06:01:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_lockdebug.c,v 1.82 2022/08/31 05:24:41 msaitoh Exp $ */
+/* $NetBSD: subr_lockdebug.c,v 1.83 2022/09/02 06:01:38 nakayama 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.82 2022/08/31 05:24:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.83 2022/09/02 06:01:38 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -729,7 +729,7 @@ lockdebug_dump(lwp_t *l, lockdebug_t *ld
char locksym[128], initsym[128], lockedsym[128], unlockedsym[128];
#ifdef DDB
- db_symstr(locksym, sizeof(locksym), (db_expr_t)ld->ld_lock,
+ db_symstr(locksym, sizeof(locksym), (db_expr_t)(intptr_t)ld->ld_lock,
DB_STGY_ANY);
db_symstr(initsym, sizeof(initsym), (db_expr_t)ld->ld_initaddr,
DB_STGY_PROC);
@@ -855,7 +855,7 @@ lockdebug_lock_print(void *addr,
uintptr_t word;
(*pr)("WARNING: lock print is unreliable without LOCKDEBUG\n");
- db_symstr(sym, sizeof(sym), (db_expr_t)addr, DB_STGY_ANY);
+ db_symstr(sym, sizeof(sym), (db_expr_t)(intptr_t)addr, DB_STGY_ANY);
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);
@@ -1075,7 +1075,8 @@ lockdebug_abort(const char *func, size_t
char locksym[128];
#ifdef DDB
- db_symstr(locksym, sizeof(locksym), (db_expr_t)lock, DB_STGY_ANY);
+ db_symstr(locksym, sizeof(locksym), (db_expr_t)(intptr_t)lock,
+ DB_STGY_ANY);
#else
snprintf(locksym, sizeof(locksym), "%#018lx", (unsigned long)lock);
#endif
