Skip to content

Commit

Permalink
x86: simplify sync_test_bit()
Browse files Browse the repository at this point in the history
There really is no need for a redundant implementation here, just keep
the alternative name for allowing consumers to use consistent naming.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jan Beulich authored and Ingo Molnar committed Apr 17, 2008
1 parent acb5b8a commit f7d909d
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions include/asm-x86/sync_bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,26 +123,7 @@ static inline int sync_test_and_change_bit(int nr, volatile unsigned long* addr)
return oldbit;
}

static __always_inline int sync_constant_test_bit(int nr, const volatile unsigned long *addr)
{
return ((1UL << (nr & 31)) &
(((const volatile unsigned int *)addr)[nr >> 5])) != 0;
}

static inline int sync_var_test_bit(int nr, const volatile unsigned long * addr)
{
int oldbit;

__asm__ __volatile__("btl %2,%1\n\tsbbl %0,%0"
:"=r" (oldbit)
:"m" (ADDR),"Ir" (nr));
return oldbit;
}

#define sync_test_bit(nr,addr) \
(__builtin_constant_p(nr) ? \
sync_constant_test_bit((nr),(addr)) : \
sync_var_test_bit((nr),(addr)))
#define sync_test_bit test_bit

#undef ADDR

Expand Down

0 comments on commit f7d909d

Please sign in to comment.