git: 5cafd6213f14 - main - exterr_set: sync the definition with the header declaration
Date: Fri, 17 Jul 2026 02:31:38 UTC
The branch main has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=5cafd6213f145bbe2a70d55eb90a3d894e66115b
commit 5cafd6213f145bbe2a70d55eb90a3d894e66115b
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-07-17 02:26:17 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-07-17 02:31:16 +0000
exterr_set: sync the definition with the header declaration
This unbreaks buildkernel with TARGET=armv7 (32-bit arm). More work may be required
in order to unbreak `exterr_set` with 32-bit kernels.
Fixes: 844009378da9 ("exterr: allow exterr to fit pointers on CHERI targets")
---
sys/kern/sys_generic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index c867867f2618..cf152018c689 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -2353,8 +2353,8 @@ kern_exterrctl(struct thread *td, u_int op, u_int flags, void *ptr)
}
int
-exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1,
- uintptr_t pp2, int line)
+exterr_set(int eerror, int category, const char *mmsg, uintptr64_t pp1,
+ uintptr64_t pp2, int line)
{
struct thread *td;