tools-bitmap-add-missing-bitmap_.patch removed from -mm tree
The quilt patch titled
Subject: tools: bitmap: add missing bitmap_[subset(), andnot()]
has been removed from the -mm tree. Its filename was
tools-bitmap-add-missing-bitmap_.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: tools: bitmap: add missing bitmap_[subset(), andnot()]
Date: Thu, 22 Jan 2026 16:06:13 +0000
The bitmap_subset() and bitmap_andnot() functions are not present in the tools version of include/linux/bitmap.h, so add them as subsequent patches implement test code that requires them.
We also add the missing __bitmap_subset() to tools/lib/bitmap.c.
---
tools/include/linux/bitmap.h | 22 ++++++++++++++++++++++ tools/lib/bitmap.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+)
tools/include/linux/bitmap.h renamed from tools/include/linux/bitmap.h~tools-bitmap-add-missing-bitmap_ +22 -0
@@ -24,6 +24,10 @@ void __bitmap_set(unsigned long *map, unvoid __bitmap_clear (unsigned long *map,unsigned int start,int len);bool __bitmap_intersects (const unsigned long *bitmap1,const unsigned long *bitmap2,unsigned int bits); +bool __bitmap_subset (const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits); +bool __bitmap_andnot (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int nbits);#define BITMAP_FIRST_WORD_MASK (start) (~0UL << ((start) & (BITS_PER_LONG - 1)))#define BITMAP_LAST_WORD_MASK (nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1)))
@@ -81,6 +85,15 @@ static inline void bitmap_or(unsigned lo__bitmap_or (dst, src1, src2, nbits); } +static __always_inline +bool bitmap_andnot(unsigned long *dst, const unsigned long *src1, +const unsigned long *src2,unsigned int nbits) +{ +if (small_const_nbits (nbits)) +return (*dst = *src1 & ~(*src2) &BITMAP_LAST_WORD_MASK (nbits)) !=0 ; +return __bitmap_andnot (dst, src1, src2, nbits); +} +static inline unsigned long *bitmap_alloc (unsigned int nbits,gfp_t flags__maybe_unused ) {return malloc (bitmap_size (nbits));
@@ -157,6 +170,15 @@ static inline bool bitmap_intersects(conreturn __bitmap_intersects (src1, src2, nbits); } +static __always_inline +bool bitmap_subset(const unsigned long *src1, const unsigned long *src2, unsigned int nbits) +{ +if (small_const_nbits (nbits)) +return ! ((*src1 & ~(*src2)) &BITMAP_LAST_WORD_MASK (nbits)); +else +return __bitmap_subset (src1, src2, nbits); +} +static inline void bitmap_set (unsigned long *map,unsigned int start,unsigned int nbits) {if (__builtin_constant_p (nbits) && nbits ==1 )
tools/lib/bitmap.c renamed from tools/lib/bitmap.c~tools-bitmap-add-missing-bitmap_ +29 -0
@@ -140,3 +140,32 @@ void __bitmap_clear(unsigned long *map, *p &= ~mask_to_clear; } } + +bool __bitmap_andnot (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int bits) +{ +unsigned int k; +unsigned int lim = bits/BITS_PER_LONG ; +unsigned long result =0 ; + +for (k =0 ; k < lim; k++) + result |= (dst[k] = bitmap1[k] & ~bitmap2[k]); +if (bits %BITS_PER_LONG ) + result |= (dst[k] = bitmap1[k] & ~bitmap2[k] & +BITMAP_LAST_WORD_MASK (bits)); +return result !=0 ; +} + +bool __bitmap_subset (const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int bits) +{ +unsigned int k, lim = bits/BITS_PER_LONG ; +for (k =0 ; k < lim; ++k) +if (bitmap1[k] & ~bitmap2[k]) +return false; + +if (bits %BITS_PER_LONG ) +if ((bitmap1[k] & ~bitmap2[k]) &BITMAP_LAST_WORD_MASK (bits)) +return false; +return true; +}
_
Patches currently in -mm which might be from [email protected] are