4374 dn_free_ranges should use range_tree_t
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>

@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
  */
 
 #include <assert.h>
 #include <fcntl.h>

@@ -770,24 +770,21 @@
 }
 
 /*
  * Find highest one bit set.
  *      Returns bit number + 1 of highest bit that is set, otherwise returns 0.
- * High order bit is 31 (or 63 in _LP64 kernel).
  */
 int
-highbit(ulong_t i)
+highbit64(uint64_t i)
 {
-        register int h = 1;
+        int h = 1;
 
         if (i == 0)
                 return (0);
-#ifdef _LP64
-        if (i & 0xffffffff00000000ul) {
+        if (i & 0xffffffff00000000ULL) {
                 h += 32; i >>= 32;
         }
-#endif
         if (i & 0xffff0000) {
                 h += 16; i >>= 16;
         }
         if (i & 0xff00) {
                 h += 8; i >>= 8;