include/asm-generic/bitops/lock.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/asm-generic/bitops/lock.h b/include/asm-generic/bitops/lock.h
index 3ae021368f48..071d8bfd86e5 100644
--- a/include/asm-generic/bitops/lock.h
+++ b/include/asm-generic/bitops/lock.h
@@ -6,6 +6,12 @@
 #include <linux/compiler.h>
 #include <asm/barrier.h>
 
+/* Drop the volatile, we will be doing READ_ONCE by hand */
+static inline atomic_long_t *atomic_long_bit_word(unsigned int nr, volatile unsigned long *p)
+{
+	return BIT_WORD(nr) + (atomic_long_t *)p;
+}
+
 /**
  * test_and_set_bit_lock - Set a bit and return its old value, for lock
  * @nr: Bit to set
@@ -20,12 +26,12 @@ static inline int test_and_set_bit_lock(unsigned int nr,
 {
 	long old;
 	unsigned long mask = BIT_MASK(nr);
+	atomic_long_t *loc = atomic_long_bit_word(nr, p);
 
-	p += BIT_WORD(nr);
-	if (READ_ONCE(*p) & mask)
+	if (atomic_read(loc) & mask)
 		return 1;
 
-	old = atomic_long_fetch_or_acquire(mask, (atomic_long_t *)p);
+	old = atomic_long_fetch_or_acquire(mask, loc);
 	return !!(old & mask);
 }