Commit cb57fb37 authored by Wei Yang's avatar Wei Yang Committed by Michael Tokarev
Browse files

bitmap: refine and move BITMAP_{FIRST/LAST}_WORD_MASK 



According to linux kernel commit <89c1e79eb30> ("linux/bitmap.h: improve
BITMAP_{LAST,FIRST}_WORD_MASK"), these two macro could be improved.

This patch takes this change and also move them all in header file.

Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 88071589

include/qemu/bitmap.h

+2 −5
Original line number Diff line number Diff line
@@ -57,11 +57,8 @@ 
 * find_next_bit(addr, nbits, bit)	Position next set bit in *addr >= bit

 */



#define BITMAP_LAST_WORD_MASK(nbits)                                    \

    (                                                                   \

        ((nbits) % BITS_PER_LONG) ?                                     \

        (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL                       \

        )

#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))

#define BITMAP_LAST_WORD_MASK(nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1)))



#define DECLARE_BITMAP(name,bits)                  \

        unsigned long name[BITS_TO_LONGS(bits)]

util/bitmap.c

+0 −2
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ int slow_bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1, 
    return result != 0;

}



#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))



void bitmap_set(unsigned long *map, long start, long nr)

{

    unsigned long *p = map + BIT_WORD(start);