From 2f90047bce7ecbc5d94c29e91fbee08aa4212dbc Mon Sep 17 00:00:00 2001 From: kib Date: Sat, 11 Feb 2017 02:00:56 +0000 Subject: MFC r313194: Define the vm_ooffset_t and vm_pindex_t types as machine-independend. --- sys/arm/include/_types.h | 2 -- sys/arm64/include/_types.h | 2 -- sys/mips/include/_types.h | 2 -- sys/powerpc/include/_types.h | 2 -- sys/riscv/include/_types.h | 2 -- sys/sparc64/include/_types.h | 2 -- sys/sys/types.h | 4 ++-- sys/x86/include/_types.h | 2 -- 8 files changed, 2 insertions(+), 16 deletions(-) diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h index b627963..204d8b3 100644 --- a/sys/arm/include/_types.h +++ b/sys/arm/include/_types.h @@ -100,9 +100,7 @@ typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; typedef __uint32_t __u_register_t; typedef __uint32_t __vm_offset_t; -typedef __int64_t __vm_ooffset_t; typedef __uint32_t __vm_paddr_t; -typedef __uint64_t __vm_pindex_t; typedef __uint32_t __vm_size_t; typedef unsigned int ___wchar_t; diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h index 8720ca8..f1d4af4 100644 --- a/sys/arm64/include/_types.h +++ b/sys/arm64/include/_types.h @@ -88,9 +88,7 @@ typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; -typedef __int64_t __vm_ooffset_t; typedef __uint64_t __vm_paddr_t; -typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; typedef unsigned int ___wchar_t; diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h index a05f01c..d37b1bc 100644 --- a/sys/mips/include/_types.h +++ b/sys/mips/include/_types.h @@ -143,8 +143,6 @@ typedef __uint64_t __vm_paddr_t; typedef __uint32_t __vm_paddr_t; #endif -typedef __int64_t __vm_ooffset_t; -typedef __uint64_t __vm_pindex_t; typedef int ___wchar_t; #define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */ diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h index 2c92afc..fc2285f 100644 --- a/sys/powerpc/include/_types.h +++ b/sys/powerpc/include/_types.h @@ -135,8 +135,6 @@ typedef __uint32_t __vm_paddr_t; #endif typedef __uint32_t __vm_size_t; #endif -typedef __int64_t __vm_ooffset_t; -typedef __uint64_t __vm_pindex_t; typedef int ___wchar_t; #define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */ diff --git a/sys/riscv/include/_types.h b/sys/riscv/include/_types.h index 733d47c..29e3c6a 100644 --- a/sys/riscv/include/_types.h +++ b/sys/riscv/include/_types.h @@ -88,9 +88,7 @@ typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; -typedef __int64_t __vm_ooffset_t; typedef __uint64_t __vm_paddr_t; -typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; typedef int ___wchar_t; diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h index 62e2fe9..70b85d9 100644 --- a/sys/sparc64/include/_types.h +++ b/sys/sparc64/include/_types.h @@ -88,9 +88,7 @@ typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; -typedef __int64_t __vm_ooffset_t; typedef __uint64_t __vm_paddr_t; -typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; typedef int ___wchar_t; diff --git a/sys/sys/types.h b/sys/sys/types.h index 6e2c012..4945e81 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -250,9 +250,9 @@ typedef struct cap_rights cap_rights_t; #endif typedef __vm_offset_t vm_offset_t; -typedef __vm_ooffset_t vm_ooffset_t; +typedef __int64_t vm_ooffset_t; typedef __vm_paddr_t vm_paddr_t; -typedef __vm_pindex_t vm_pindex_t; +typedef __uint64_t vm_pindex_t; typedef __vm_size_t vm_size_t; typedef __rman_res_t rman_res_t; diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h index e6d1f60..8aa0e2b 100644 --- a/sys/x86/include/_types.h +++ b/sys/x86/include/_types.h @@ -142,8 +142,6 @@ typedef __uint32_t __vm_paddr_t; #endif typedef __uint32_t __vm_size_t; #endif -typedef __int64_t __vm_ooffset_t; -typedef __uint64_t __vm_pindex_t; typedef int ___wchar_t; #define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */ -- cgit v1.1