BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 22:37:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

x86: Use REP BSF unconditionally

Browse Source 
Make "REP BSF" unconditional, as per the suggestion of hpa
and Linus, this removes the insane BSF_PREFIX conditional
and simplifies the logic.

Suggested-by: "H. Peter Anvin" <[email protected]>
Suggested-by: Linus Torvalds <[email protected]>
Signed-off-by: Jan Beulich <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Jan Beulich authored and Ingo Molnar committed 2012-09-19 17:26:08 +02:00
1 parent 5870661c09
commit e26a44a2d6
1 file changed
+2 -17
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/include/asm/bitops.h
+2 -17
View File
@@ -347,19 +347,6 @@ static int test_bit(int nr, const volatile unsigned long *addr);
? constant_test_bit((nr), (addr)) \
: variable_test_bit((nr), (addr)))
#if (defined(CONFIG_X86_GENERIC) || defined(CONFIG_GENERIC_CPU)) \
&& !defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
/*
* Since BSF and TZCNT have sufficiently similar semantics for the purposes
* for which we use them here, BMI-capable hardware will decode the prefixed
* variant as 'tzcnt ...' and may execute that faster than 'bsf ...', while
* older hardware will ignore the REP prefix and decode it as 'bsf ...'.
*/
# define BSF_PREFIX "rep;"
#else
# define BSF_PREFIX
#endif
/**
* __ffs - find first set bit in word
* @word: The word to search
@@ -368,7 +355,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
*/
static inline unsigned long __ffs(unsigned long word)
{
asm(BSF_PREFIX "bsf %1,%0"
asm("rep; bsf %1,%0"
: "=r" (word)
: "rm" (word));
return word;
@@ -382,14 +369,12 @@ static inline unsigned long __ffs(unsigned long word)
*/
static inline unsigned long ffz(unsigned long word)
{
asm(BSF_PREFIX "bsf %1,%0"
asm("rep; bsf %1,%0"
: "=r" (word)
: "r" (~word));
return word;
}
#undef BSF_PREFIX
/*
* __fls: find last set bit in word
* @word: The word to search