svn commit: r300544 - in head/sys: kern sys

[Alan Somers]

Author: asomers
Date: Tue May 24 00:14:58 2016
New Revision: 300544
URL: https://svnweb.freebsd.org/changeset/base/300544

Log:
  Fix build of kern/subr_unit.c, broken by r300539
  
  Reported by:	peter
  Pointyhat to:	asomers
  Sponsored by:	Spectra Logic Corp

Modified:
  head/sys/kern/subr_unit.c
  head/sys/sys/bitstring.h

Modified: head/sys/kern/subr_unit.c
==============================================================================
--- head/sys/kern/subr_unit.c	Mon May 23 23:00:47 2016	(r300543)
+++ head/sys/kern/subr_unit.c	Tue May 24 00:14:58 2016	(r300544)
@@ -984,9 +984,9 @@ main(int argc, char **argv)
 	struct unrhdr *uh;
 	char *a;
 	long count = 10000;	/* Number of unrs to test */
-	long reps = 1;
+	long reps = 1, m;
 	int ch;
-	u_int i, x, m, j;
+	u_int i, x, j;
 
 	verbose = false;
 
@@ -1043,7 +1043,7 @@ main(int argc, char **argv)
 			print_unrhdr(uh);
 		check_unrhdr(uh, __LINE__);
 	}
-	for (i = 0; i < count; i++) {
+	for (i = 0; i < (u_int)count; i++) {
 		if (a[i]) {
 			if (verbose) {
 				printf("C %u\n", i);

Modified: head/sys/sys/bitstring.h
==============================================================================
--- head/sys/sys/bitstring.h	Mon May 23 23:00:47 2016	(r300543)
+++ head/sys/sys/bitstring.h	Tue May 24 00:14:58 2016	(r300544)
@@ -65,9 +65,10 @@
 #ifdef _KERNEL
 #include <sys/libkern.h>
 #include <sys/malloc.h>
-#include <sys/types.h>
 #endif
 
+#include <sys/types.h>
+
 typedef	unsigned long bitstr_t;
 
 /*---------------------- Private Implementation Details ----------------------*/