constant_test_bit() is functionally the same as generic_test_bit(),
so constant_test_bit() can be dropped and replaced with
generic_test_bit().
Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
Changes in V13:
- new patch ( this patch is dependent on
xen: introduce generic non-atomic test_*bit() )
---
xen/arch/x86/include/asm/bitops.h | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h
index f9aa60111f..8c0403405a 100644
--- a/xen/arch/x86/include/asm/bitops.h
+++ b/xen/arch/x86/include/asm/bitops.h
@@ -277,12 +277,6 @@ static inline int test_and_change_bit(int nr, volatile void *addr)
test_and_change_bit(nr, addr); \
})
-static inline int constant_test_bit(int nr, const volatile void *addr)
-{
- return ((1U << (nr & 31)) &
- (((const volatile unsigned int *)addr)[nr >> 5])) != 0;
-}
-
static inline int variable_test_bit(int nr, const volatile void *addr)
{
int oldbit;
@@ -297,7 +291,7 @@ static inline int variable_test_bit(int nr, const volatile void *addr)
#define arch_test_bit(nr, addr) ({ \
__builtin_constant_p(nr) ? \
- constant_test_bit(nr, addr) : \
+ generic_test_bit(nr, addr) : \
variable_test_bit(nr, addr); \
})
--
2.45.2