diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:04:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:04:28 +0100 |
| commit | 650400b2ccb8542ff4e2677d66ff083d01c7bd6a (patch) | |
| tree | 055ddec9479ec30cca661989b9902c13f52d533a /include/linux/bitops.h | |
| parent | 0fd2e9c53d82704a3ba87ea1980ec515188c5316 (diff) | |
| parent | fec8f5ae1715a01c72ad52cb2ecd8aacaf142302 (diff) | |
Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base
Conflicts:
arch/x86/kernel/cpu/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/bitops.h')
| -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 8a7e9924df57..d03c5dd6185d 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -228,32 +228,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 |