logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0012-Remove-definition-of-highbit64-and-lowbit64.patch (1644B)

    

  1. From cfc27efc55e81d952d96d7257b60fde6f9dff36d Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Wed, 29 Jan 2025 01:41:00 -0800
  4. Subject: [PATCH] Remove definition of highbit64 and lowbit64
  6. For zstream, this is normally defined in lib/libzpool/kernel.c, but
  7. that pulls in a bunch of other stuff.
  9. Instead, we'll just supply our own versions that support non-GNU
  10. compilers.
  11. ---
  12.  cmd/zpool/zpool_util.c | 26 --------------------------
  13.  cmd/zpool/zpool_util.h |  2 --
  14.  2 files changed, 28 deletions(-)
  16. diff --git a/cmd/zpool/zpool_util.c b/cmd/zpool/zpool_util.c
  17. index e7ff739e5..cd2c86995 100644
  18. --- a/cmd/zpool/zpool_util.c
  19. +++ b/cmd/zpool/zpool_util.c
  20. @@ -113,29 +113,3 @@ array64_max(uint64_t array[], unsigned int len)
  21.  
  22.  	return (max);
  23.  }
  24. -
  25. -/*
  26. - * Find highest one bit set.
  27. - * Returns bit number + 1 of highest bit that is set, otherwise returns 0.
  28. - */
  29. -int
  30. -highbit64(uint64_t i)
  31. -{
  32. -	if (i == 0)
  33. -		return (0);
  34. -
  35. -	return (NBBY * sizeof (uint64_t) - __builtin_clzll(i));
  36. -}
  37. -
  38. -/*
  39. - * Find lowest one bit set.
  40. - * Returns bit number + 1 of lowest bit that is set, otherwise returns 0.
  41. - */
  42. -int
  43. -lowbit64(uint64_t i)
  44. -{
  45. -	if (i == 0)
  46. -		return (0);
  47. -
  48. -	return (__builtin_ffsll(i));
  49. -}
  50. diff --git a/cmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h
  51. index 7f5406f06..f340e7bbc 100644
  52. --- a/cmd/zpool/zpool_util.h
  53. +++ b/cmd/zpool/zpool_util.h
  54. @@ -44,8 +44,6 @@ void *safe_realloc(void *, size_t);
  55.  void zpool_no_memory(void);
  56.  uint_t num_logs(nvlist_t *nv);
  57.  uint64_t array64_max(uint64_t array[], unsigned int len);
  58. -int highbit64(uint64_t i);
  59. -int lowbit64(uint64_t i);
  60.  
  61.  /*
  62.   * Misc utility functions
  63. -- 
  64. 2.44.0