aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2025-11-27 14:54:56 +0000
committerBrooks Davis <brooks@FreeBSD.org>2025-11-27 14:54:56 +0000
commit6aaba753830ec1d82959f21151dfb6563d38efba (patch)
treef8b6a6f7516709aefe1386c7b174545486f135e2
parentdca634d1544b5cd202dcd06c8c5ea5cbea6c3300 (diff)
sys/_types.h: centralize __vm_offset_t and __vm_size_t definitions
Use __ptraddr_t to define __vm_offset_t and __size_t for __vm_size_t rather than per-pointer-size definitions. Reviewed by: kib, markj Effort: CHERI upstreaming Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D53818
-rw-r--r--sys/sys/_types.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/sys/_types.h b/sys/sys/_types.h
index 6e69b06f689d..3589fcb87a9e 100644
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
@@ -72,15 +72,11 @@ typedef __int64_t __intptr_t;
typedef __int64_t __intfptr_t;
typedef __uint64_t __uintptr_t;
typedef __uint64_t __uintfptr_t;
-typedef __uint64_t __vm_offset_t;
-typedef __uint64_t __vm_size_t;
#elif __SIZEOF_POINTER__ == 4
typedef __int32_t __intptr_t;
typedef __int32_t __intfptr_t;
typedef __uint32_t __uintptr_t;
typedef __uint32_t __uintfptr_t;
-typedef __uint32_t __vm_offset_t;
-typedef __uint32_t __vm_size_t;
#else
#error unsupported pointer size
#endif
@@ -109,6 +105,9 @@ typedef __PTRADDR_TYPE__ __ptraddr_t;
typedef __size_t __ptraddr_t;
#endif
+typedef __ptraddr_t __vm_offset_t;
+typedef __size_t __vm_size_t;
+
/*
* Target-dependent type definitions.
*/