diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-04 10:24:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-04 10:24:11 -0700 |
| commit | 3eba620e7bd772a0c7dc91966cb107872b54a910 (patch) | |
| tree | 338ecf655aa4576e16158a9a74887cc26a3467ac /arch/x86/boot | |
| parent | 193e2268a3bb1404b42f8edcc037a3eafd165aa9 (diff) | |
| parent | 30ea703a38ef76ca119673cd8bdd05c6e068e2ac (diff) | |
| download | linux-3eba620e7bd772a0c7dc91966cb107872b54a910.tar.bz2 | |
Merge tag 'x86_cleanups_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Borislav Petkov:
- The usual round of smaller fixes and cleanups all over the tree
* tag 'x86_cleanups_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpu: Include the header of init_ia32_feat_ctl()'s prototype
x86/uaccess: Improve __try_cmpxchg64_user_asm() for x86_32
x86: Fix various duplicate-word comment typos
x86/boot: Remove superfluous type casting from arch/x86/boot/bitops.h
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/bitops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h index 02e1dea11d94..8518ae214c9b 100644 --- a/arch/x86/boot/bitops.h +++ b/arch/x86/boot/bitops.h @@ -19,13 +19,13 @@ static inline bool constant_test_bit(int nr, const void *addr) { - const u32 *p = (const u32 *)addr; + const u32 *p = addr; return ((1UL << (nr & 31)) & (p[nr >> 5])) != 0; } static inline bool variable_test_bit(int nr, const void *addr) { bool v; - const u32 *p = (const u32 *)addr; + const u32 *p = addr; asm("btl %2,%1" CC_SET(c) : CC_OUT(c) (v) : "m" (*p), "Ir" (nr)); return v; |