From owner-svn-src-head@freebsd.org  Tue May 24 00:15:00 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A572B476E5;
 Tue, 24 May 2016 00:15:00 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D08EE1960;
 Tue, 24 May 2016 00:14:59 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4O0Ex2V045500;
 Tue, 24 May 2016 00:14:59 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4O0EwKT045498;
 Tue, 24 May 2016 00:14:58 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201605240014.u4O0EwKT045498@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 24 May 2016 00:14:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300544 - in head/sys: kern sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 May 2016 00:15:00 -0000

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 ----------------------*/