Index: sys/sysctl.h
===================================================================
RCS file: /cvs/src/sys/sys/sysctl.h,v
retrieving revision 1.172
diff -u -p -r1.172 sysctl.h
--- sys/sysctl.h	27 Feb 2017 19:16:56 -0000	1.172
+++ sys/sysctl.h	5 Jun 2017 07:08:43 -0000
@@ -932,8 +932,8 @@ int sysctl_string(void *, size_t *, void
 int sysctl_tstring(void *, size_t *, void *, size_t, char *, int);
 int sysctl__string(void *, size_t *, void *, size_t, char *, int, int);
 int sysctl_rdstring(void *, size_t *, void *, const char *);
-int sysctl_rdstruct(void *, size_t *, void *, const void *, int);
-int sysctl_struct(void *, size_t *, void *, size_t, void *, int);
+int sysctl_rdstruct(void *, size_t *, void *, const void *, size_t);
+int sysctl_struct(void *, size_t *, void *, size_t, void *, size_t);
 int sysctl_file(int *, u_int, char *, size_t *, struct proc *);
 int sysctl_doproc(int *, u_int, char *, size_t *);
 struct rtentry;
Index: kern/kern_sysctl.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_sysctl.c,v
retrieving revision 1.326
diff -u -p -r1.326 kern_sysctl.c
--- kern/kern_sysctl.c	6 May 2017 18:18:11 -0000	1.326
+++ kern/kern_sysctl.c	5 Jun 2017 07:08:43 -0000
@@ -977,7 +977,8 @@ sysctl__string(void *oldp, size_t *oldle
 int
 sysctl_rdstring(void *oldp, size_t *oldlenp, void *newp, const char *str)
 {
-	int len, error = 0;
+	size_t len;
+	int error = 0;
 
 	len = strlen(str) + 1;
 	if (oldp && *oldlenp < len)
@@ -996,7 +997,7 @@ sysctl_rdstring(void *oldp, size_t *oldl
  */
 int
 sysctl_struct(void *oldp, size_t *oldlenp, void *newp, size_t newlen, void *sp,
-    int len)
+    size_t len)
 {
 	int error = 0;
 
@@ -1019,7 +1020,7 @@ sysctl_struct(void *oldp, size_t *oldlen
  */
 int
 sysctl_rdstruct(void *oldp, size_t *oldlenp, void *newp, const void *sp,
-    int len)
+    size_t len)
 {
 	int error = 0;