Author: avg
Date: Fri Oct 23 15:14:37 2015
New Revision: 289832
URL: https://svnweb.freebsd.org/changeset/base/289832

Log:
  Partial MFC r253719: add flsll to libkern
  
  Original commit description:
    Fix watchdog pretimeout.
    ...
  
  Only flsll bits of that commit are needed.
  This should fix the build broken in r289820 for !amd64.
  
  Pointyhat to: avg

Added:
  stable/9/sys/libkern/flsll.c
     - copied unchanged from r253719, head/sys/libkern/flsll.c
Modified:
  stable/9/sys/sys/libkern.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/sys/   (props changed)

Copied: stable/9/sys/libkern/flsll.c (from r253719, head/sys/libkern/flsll.c)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/9/sys/libkern/flsll.c        Fri Oct 23 15:14:37 2015        
(r289832, copy of r253719, head/sys/libkern/flsll.c)
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#include <sys/libkern.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Find Last Set bit
+ */
+int
+flsll(long long mask)
+{
+       int bit;
+
+       if (mask == 0)
+               return (0);
+       for (bit = 1; mask != 1; bit++)
+               mask = (unsigned long long)mask >> 1;
+       return (bit);
+}

Modified: stable/9/sys/sys/libkern.h
==============================================================================
--- stable/9/sys/sys/libkern.h  Fri Oct 23 15:08:16 2015        (r289831)
+++ stable/9/sys/sys/libkern.h  Fri Oct 23 15:14:37 2015        (r289832)
@@ -94,6 +94,10 @@ int   fls(int);
 #ifndef        HAVE_INLINE_FLSL
 int     flsl(long);
 #endif
+#ifndef        HAVE_INLINE_FLSLL
+int     flsll(long long);
+#endif
+
 #define        bitcount64(x)   __bitcount64((uint64_t)(x))
 #define        bitcount32(x)   __bitcount32((uint32_t)(x))
 #define        bitcount16(x)   __bitcount16((uint16_t)(x))
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to