From cdeace021b56ecf98914f18ec355df07fd517c77 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 2 Sep 2026 12:32:42 +0100 Subject: [PATCH] x86/bitops: Remove CONST_ADDR All this does is obfuscate the usage sites. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Teddy Astie --- xen/arch/x86/include/asm/bitops.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/bitops.h b/xen/arch/x86/include/asm/bitops.h index 69ffed510c..66e2b522d5 100644 --- a/xen/arch/x86/include/asm/bitops.h +++ b/xen/arch/x86/include/asm/bitops.h @@ -18,7 +18,6 @@ */ #define ADDR (*(volatile int *) addr) -#define CONST_ADDR (*(const volatile int *) addr) /** * set_bit - Atomically set a bit in memory @@ -285,7 +284,9 @@ static inline int variable_test_bit(int nr, const volatile void *addr) asm volatile ( "btl %[nr], %[addr]\n\t" ASM_FLAG_OUT(, "sbbl %[old], %[old]\n\t") : [old] ASM_FLAG_OUT("=@ccc", "=r") (oldbit) - : [addr] "m" (CONST_ADDR), [nr] "Ir" (nr) : "memory" ); + : [addr] "m" (*(const volatile int *)addr), + [nr] "Ir" (nr) + : "memory" ); return oldbit; }