Commit 7f32a6cf authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

tools: Drop conflicting non-atomic test_and_{clear,set}_bit() helpers 



Drop tools' non-atomic test_and_set_bit() and test_and_clear_bit() helpers
now that all users are gone.  The names will be claimed in the future for
atomic versions.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20221119013450.2643007-8-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 03a0c819

tools/include/linux/bitmap.h

+0 −34
Original line number Diff line number Diff line
@@ -77,40 +77,6 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1, 
		__bitmap_or(dst, src1, src2, nbits);

}



/**

 * test_and_set_bit - Set a bit and return its old value

 * @nr: Bit to set

 * @addr: Address to count from

 */

static inline int test_and_set_bit(int nr, unsigned long *addr)

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);

	unsigned long old;



	old = *p;

	*p = old | mask;



	return (old & mask) != 0;

}



/**

 * test_and_clear_bit - Clear a bit and return its old value

 * @nr: Bit to clear

 * @addr: Address to count from

 */

static inline int test_and_clear_bit(int nr, unsigned long *addr)

{

	unsigned long mask = BIT_MASK(nr);

	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);

	unsigned long old;



	old = *p;

	*p = old & ~mask;



	return (old & mask) != 0;

}



/**

 * bitmap_zalloc - Allocate bitmap

 * @nbits: Number of bits