diff options
| author | Ingo Molnar | 2017-11-06 01:43:13 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-11-06 01:43:13 +0100 |
| commit | 19c5787a5ff88a959e5854ab6ddef7f5777c5837 (patch) | |
| tree | 4aad2b3ff9e6e02ae45398470495dfe88cf7f6b9 /include | |
| parent | 1e4c4f610f774df6088d7c065b2dd4d22adba698 (diff) | |
| parent | 1943dc07b45e347c52c1bfdd4a37e04a86e399aa (diff) | |
Merge branch 'x86/fpu' into x86/asm, to pick up fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bitops.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 36794f058ba6..8fbe259b197c 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -227,32 +227,6 @@ static inline unsigned long __ffs64(u64 word) return __ffs((unsigned long)word); } -/* - * clear_bit32 - Clear a bit in memory for u32 array - * @nr: Bit to clear - * @addr: u32 * address of bitmap - * - * Same as clear_bit, but avoids needing casts for u32 arrays. - */ - -static __always_inline void clear_bit32(long nr, volatile u32 *addr) -{ - clear_bit(nr, (volatile unsigned long *)addr); -} - -/* - * set_bit32 - Set a bit in memory for u32 array - * @nr: Bit to clear - * @addr: u32 * address of bitmap - * - * Same as set_bit, but avoids needing casts for u32 arrays. - */ - -static __always_inline void set_bit32(long nr, volatile u32 *addr) -{ - set_bit(nr, (volatile unsigned long *)addr); -} - #ifdef __KERNEL__ #ifndef set_mask_bits |