From 5b061018af011431278059069ba60c4e47e81462 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 19 Aug 2023 12:39:25 -0700
Subject: [PATCH] git subrepo pull --force sys/contrib/subrepo-openzfs

subrepo:
  subdir:   "sys/contrib/subrepo-openzfs"
  merged:   "814d89e91ecd"
upstream:
  origin:   "https://github.com/CTSRD-CHERI/zfs.git"
  branch:   "cheri-hybrid"
  commit:   "814d89e91ecd"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
---
 sys/contrib/subrepo-openzfs/.gitrepo            | 4 ++--
 sys/contrib/subrepo-openzfs/include/sys/types.h | 5 +++++
 sys/contrib/subrepo-openzfs/module/zfs/zcp.c    | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sys/contrib/subrepo-openzfs/.gitrepo b/sys/contrib/subrepo-openzfs/.gitrepo
index 4d142e0d39a9..96f8fa50e150 100644
--- a/sys/contrib/subrepo-openzfs/.gitrepo
+++ b/sys/contrib/subrepo-openzfs/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/CTSRD-CHERI/zfs.git
 	branch = cheri-hybrid
-	commit = 5a6334a98a401987721ce9745d05a170c192de06
-	parent = 8d0ce2406490ebbb8c587fcba219559cc67a641f
+	commit = 814d89e91ecd28a2b4106901cda2a83669dbcf64
+	parent = 1230eeac69cc90bd86a6da27e24513c4013e1b1c
 	method = merge
 	cmdver = 0.4.3
diff --git a/sys/contrib/subrepo-openzfs/include/sys/types.h b/sys/contrib/subrepo-openzfs/include/sys/types.h
index ae59f943e420..745afc4775d7 100644
--- a/sys/contrib/subrepo-openzfs/include/sys/types.h
+++ b/sys/contrib/subrepo-openzfs/include/sys/types.h
@@ -10,6 +10,11 @@ typedef __ptraddr_t             ptraddr_t;
 #define	_PTRADDR_T_DECLARED
 #endif
 
+#ifndef _INT64PTR_T_DECLARED
+typedef	long long		int64ptr_t;
+#define	_INT64PTR_T_DECLARED
+#endif
+
 #ifndef _UINT64PTR_T_DECLARED
 typedef	unsigned long long	uint64ptr_t;
 #define	_UINT64PTR_T_DECLARED
diff --git a/sys/contrib/subrepo-openzfs/module/zfs/zcp.c b/sys/contrib/subrepo-openzfs/module/zfs/zcp.c
index 959404f665ab..6b1e34017562 100644
--- a/sys/contrib/subrepo-openzfs/module/zfs/zcp.c
+++ b/sys/contrib/subrepo-openzfs/module/zfs/zcp.c
@@ -726,7 +726,7 @@ zcp_lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 
 	if (nsize == 0) {
 		if (ptr != NULL) {
-			int64_t *allocbuf = (int64_t *)ptr - 1;
+			int64ptr_t *allocbuf = (int64ptr_t *)ptr - 1;
 			int64_t allocsize = *allocbuf;
 			ASSERT3S(allocsize, >, 0);
 			ASSERT3S(allocargs->aa_alloc_remaining + allocsize, <=,
@@ -736,8 +736,8 @@ zcp_lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 		}
 		return (NULL);
 	} else if (ptr == NULL) {
-		int64_t *allocbuf;
-		int64_t allocsize = nsize + sizeof (int64_t);
+		int64ptr_t *allocbuf;
+		int64_t allocsize = nsize + sizeof (int64ptr_t);
 
 		if (!allocargs->aa_must_succeed &&
 		    (allocsize <= 0 ||