Commit 050026fe authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86/urgent' of git://

* 'x86/urgent' of git://
  x86: Avoid 'constant_test_bit()' misoptimization due to cast to non-volatile
parents 252a52aa c9e2fbd9
......@@ -309,7 +309,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
static __always_inline int constant_test_bit(unsigned int nr, const volatile unsigned long *addr)
return ((1UL << (nr % BITS_PER_LONG)) &
(((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;
(addr[nr / BITS_PER_LONG])) != 0;
static inline int variable_test_bit(int nr, volatile const unsigned long *addr)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment