11 files changed, 25 insertions, 17 deletions

diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index d657d44ef868f..2353483679034 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -316,7 +316,7 @@ _amd64_kvatop(kvm_t *kd, kvaddr_t va, off_t *pa)
 }
 
 int
-_amd64_native(kvm_t *kd)
+_amd64_native(kvm_t *kd __unused)
 {
 
 #ifdef __amd64__
@@ -326,7 +326,7 @@ _amd64_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_amd64 = {
+static struct kvm_arch kvm_amd64 = {
 	.ka_probe = _amd64_probe,
 	.ka_initvtop = _amd64_initvtop,
 	.ka_freevtop = _amd64_freevtop,
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index 97a823690d26a..db468008d2c37 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -249,7 +249,11 @@ _kvm_mdopen(kvm_t *kd)
 #endif
 
 int
+#ifdef __arm__
 _arm_native(kvm_t *kd)
+#else
+_arm_native(kvm_t *kd __unused)
+#endif
 {
 
 #ifdef __arm__
@@ -263,7 +267,7 @@ _arm_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_arm = {
+static struct kvm_arch kvm_arm = {
 	.ka_probe = _arm_probe,
 	.ka_initvtop = _arm_initvtop,
 	.ka_freevtop = _arm_freevtop,
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 3c3a477973ccc..37f5cad253166 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -409,7 +409,7 @@ _i386_kvatop(kvm_t *kd, kvaddr_t va, off_t *pa)
 }
 
 int
-_i386_native(kvm_t *kd)
+_i386_native(kvm_t *kd __unused)
 {
 
 #ifdef __i386__
@@ -419,7 +419,7 @@ _i386_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_i386 = {
+static struct kvm_arch kvm_i386 = {
 	.ka_probe = _i386_probe,
 	.ka_initvtop = _i386_initvtop,
 	.ka_freevtop = _i386_freevtop,
diff --git a/lib/libkvm/kvm_minidump_aarch64.c b/lib/libkvm/kvm_minidump_aarch64.c
index ffe27bdd527d3..7081809faca22 100644
--- a/lib/libkvm/kvm_minidump_aarch64.c
+++ b/lib/libkvm/kvm_minidump_aarch64.c
@@ -215,7 +215,7 @@ _aarch64_minidump_kvatop(kvm_t *kd, kvaddr_t va, off_t *pa)
 }
 
 static int
-_aarch64_native(kvm_t *kd)
+_aarch64_native(kvm_t *kd __unused)
 {
 
 #ifdef __aarch64__
@@ -225,7 +225,7 @@ _aarch64_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_aarch64_minidump = {
+static struct kvm_arch kvm_aarch64_minidump = {
 	.ka_probe = _aarch64_minidump_probe,
 	.ka_initvtop = _aarch64_minidump_initvtop,
 	.ka_freevtop = _aarch64_minidump_freevtop,
diff --git a/lib/libkvm/kvm_minidump_amd64.c b/lib/libkvm/kvm_minidump_amd64.c
index 21bb5d4774b22..1baca96d71f60 100644
--- a/lib/libkvm/kvm_minidump_amd64.c
+++ b/lib/libkvm/kvm_minidump_amd64.c
@@ -297,7 +297,7 @@ _amd64_minidump_kvatop(kvm_t *kd, kvaddr_t va, off_t *pa)
 		return (_amd64_minidump_vatop(kd, va, pa));
 }
 
-struct kvm_arch kvm_amd64_minidump = {
+static struct kvm_arch kvm_amd64_minidump = {
 	.ka_probe = _amd64_minidump_probe,
 	.ka_initvtop = _amd64_minidump_initvtop,
 	.ka_freevtop = _amd64_minidump_freevtop,
diff --git a/lib/libkvm/kvm_minidump_arm.c b/lib/libkvm/kvm_minidump_arm.c
index 53ca3f02fa733..41b99505f86d8 100644
--- a/lib/libkvm/kvm_minidump_arm.c
+++ b/lib/libkvm/kvm_minidump_arm.c
@@ -209,7 +209,7 @@ invalid:
 	return (0);
 }
 
-struct kvm_arch kvm_arm_minidump = {
+static struct kvm_arch kvm_arm_minidump = {
 	.ka_probe = _arm_minidump_probe,
 	.ka_initvtop = _arm_minidump_initvtop,
 	.ka_freevtop = _arm_minidump_freevtop,
diff --git a/lib/libkvm/kvm_minidump_i386.c b/lib/libkvm/kvm_minidump_i386.c
index c8fc38eb45bc3..129a14b19d72e 100644
--- a/lib/libkvm/kvm_minidump_i386.c
+++ b/lib/libkvm/kvm_minidump_i386.c
@@ -238,7 +238,7 @@ _i386_minidump_kvatop(kvm_t *kd, kvaddr_t va, off_t *pa)
 		return (_i386_minidump_vatop(kd, va, pa));
 }
 
-struct kvm_arch kvm_i386_minidump = {
+static struct kvm_arch kvm_i386_minidump = {
 	.ka_probe = _i386_minidump_probe,
 	.ka_initvtop = _i386_minidump_initvtop,
 	.ka_freevtop = _i386_minidump_freevtop,
diff --git a/lib/libkvm/kvm_minidump_mips.c b/lib/libkvm/kvm_minidump_mips.c
index 77d1892df3a21..96534e8d04f94 100644
--- a/lib/libkvm/kvm_minidump_mips.c
+++ b/lib/libkvm/kvm_minidump_mips.c
@@ -241,7 +241,11 @@ invalid:
 }
 
 static int
+#ifdef __mips__
 _mips_native(kvm_t *kd)
+#else
+_mips_native(kvm_t *kd __unused)
+#endif
 {
 
 #ifdef __mips__
@@ -269,7 +273,7 @@ _mips_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_mips_minidump = {
+static struct kvm_arch kvm_mips_minidump = {
 	.ka_probe = _mips_minidump_probe,
 	.ka_initvtop = _mips_minidump_initvtop,
 	.ka_freevtop = _mips_minidump_freevtop,
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
index 39fbf4341f941..34b99eb0a2762 100644
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.c
@@ -214,7 +214,7 @@ _powerpc_kvatop(kvm_t *kd, kvaddr_t va, off_t *ofs)
 }
 
 static int
-_powerpc_native(kvm_t *kd)
+_powerpc_native(kvm_t *kd __unused)
 {
 
 #if defined(__powerpc__) && !defined(__powerpc64__)
@@ -224,7 +224,7 @@ _powerpc_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_powerpc = {
+static struct kvm_arch kvm_powerpc = {
 	.ka_probe = _powerpc_probe,
 	.ka_initvtop = _powerpc_initvtop,
 	.ka_freevtop = _powerpc_freevtop,
diff --git a/lib/libkvm/kvm_powerpc64.c b/lib/libkvm/kvm_powerpc64.c
index 79121857c6d46..c15ec881e19e1 100644
--- a/lib/libkvm/kvm_powerpc64.c
+++ b/lib/libkvm/kvm_powerpc64.c
@@ -215,7 +215,7 @@ _powerpc64_kvatop(kvm_t *kd, kvaddr_t va, off_t *ofs)
 }
 
 static int
-_powerpc64_native(kvm_t *kd)
+_powerpc64_native(kvm_t *kd __unused)
 {
 
 #ifdef __powerpc64__
@@ -225,7 +225,7 @@ _powerpc64_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_powerpc64 = {
+static struct kvm_arch kvm_powerpc64 = {
 	.ka_probe = _powerpc64_probe,
 	.ka_initvtop = _powerpc64_initvtop,
 	.ka_freevtop = _powerpc64_freevtop,
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index 571b7bb8a393c..ff08cd82720f9 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -221,7 +221,7 @@ invalid:
 }
 
 static int
-_sparc64_native(kvm_t *kd)
+_sparc64_native(kvm_t *kd __unused)
 {
 
 #ifdef __sparc64__
@@ -231,7 +231,7 @@ _sparc64_native(kvm_t *kd)
 #endif
 }
 
-struct kvm_arch kvm_sparc64 = {
+static struct kvm_arch kvm_sparc64 = {
 	.ka_probe = _sparc64_probe,
 	.ka_initvtop = _sparc64_initvtop,
 	.ka_freevtop = _sparc64_freevtop,