arch/x86/include/asm/bitops.h | 1 +
 include/linux/bitops.h        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index 0fe9de58af31..b82006138c60 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -246,6 +246,7 @@ arch_test_bit_acquire(unsigned long nr, const volatile unsigned long *addr)
 	return __builtin_constant_p(nr) ? constant_test_bit_acquire(nr, addr) :
 					  variable_test_bit(nr, addr);
 }
+#define arch_test_bit_acquire arch_test_bit_acquire
 
 /**
  * __ffs - find first set bit in word
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 3b89c64bcfd8..a046b9c45fdb 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -67,6 +67,10 @@ extern unsigned long __sw_hweight64(__u64 w);
  */
 #include <asm/bitops.h>
 
+#ifndef arch_test_bit_acquire
+#define arch_test_bit_acquire generic_test_bit_acquire
+#endif
+
 /* Check that the bitops prototypes are sane */
 #define __check_bitop_pr(name)						\
 	static_assert(__same_type(arch_##name, generic_##name) &&	\