From owner-svn-src-all@FreeBSD.ORG  Wed Jun 17 17:16:07 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7790EDFB;
 Wed, 17 Jun 2015 17:16:07 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 65D978D1;
 Wed, 17 Jun 2015 17:16:07 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HHG7rv009175;
 Wed, 17 Jun 2015 17:16:07 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HHG7ec009174;
 Wed, 17 Jun 2015 17:16:07 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201506171716.t5HHG7ec009174@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 17 Jun 2015 17:16:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284520 - head/sys/cddl/contrib/opensolaris/uts/common/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2015 17:16:07 -0000

Author: avg
Date: Wed Jun 17 17:16:06 2015
New Revision: 284520
URL: https://svnweb.freebsd.org/changeset/base/284520

Log:
  Revert r284511 because it caused build failures on many platforms
  
  The problem is that when inline versions of flsl and flsll are not
  available, then libkern.h must be included for their declarations
  in kernel sources.
  The fix would be trivial, but I would like to figure out first if
  it even makes sense to use the libkern provided implementations.
  
  Reported by:	bz
  Pointyhat to:	avg

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h

Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h	Wed Jun 17 17:11:44 2015	(r284519)
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h	Wed Jun 17 17:16:06 2015	(r284520)
@@ -32,13 +32,6 @@
 
 #include <sys/param.h>
 #include <sys/isa_defs.h>
-#ifdef __FreeBSD__
-#ifdef _KERNEL
-#include <machine/cpufunc.h>
-#else
-#include <strings.h>
-#endif
-#endif
 
 #ifdef	__cplusplus
 extern "C" {
@@ -389,9 +382,6 @@ extern unsigned char bcd_to_byte[256];
 static __inline int
 highbit(ulong_t i)
 {
-#ifdef __FreeBSD__
-	return (flsl(i));
-#else
 	register int h = 1;
 
 	if (i == 0)
@@ -417,7 +407,6 @@ highbit(ulong_t i)
 		h += 1;
 	}
 	return (h);
-#endif
 }
 
 /*
@@ -427,9 +416,6 @@ highbit(ulong_t i)
 static __inline int
 highbit64(uint64_t i)
 {
-#ifdef __FreeBSD__
-	return (flsll(i));
-#else
 	int h = 1;
 
 	if (i == 0)
@@ -453,7 +439,6 @@ highbit64(uint64_t i)
 		h += 1;
 	}
 	return (h);
-#endif
 }
 
 #ifdef	__cplusplus