Commit e8258733 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86, kcsan: Remove __no_kcsan_or_inline usage



Now that KCSAN relies on -tsan-distinguish-volatile we no longer need
the annotation for constant_test_bit(). Remove it.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent b3a9e3b9
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -201,12 +201,8 @@ arch_test_and_change_bit(long nr, volatile unsigned long *addr)
	return GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(btc), *addr, c, "Ir", nr);
}

static __no_kcsan_or_inline bool constant_test_bit(long nr, const volatile unsigned long *addr)
static __always_inline bool constant_test_bit(long nr, const volatile unsigned long *addr)
{
	/*
	 * Because this is a plain access, we need to disable KCSAN here to
	 * avoid double instrumentation via instrumented bitops.
	 */
	return ((1UL << (nr & (BITS_PER_LONG-1))) &
		(addr[nr >> _BITOPS_LONG_SHIFT])) != 0;
}