diff options
author | Peter Zijlstra <peterz@infradead.org> | 2022-09-29 12:20:50 +0200 |
---|---|---|
committer | Peter Zijlstra <peterz@infradead.org> | 2022-09-29 12:20:50 +0200 |
commit | a1ebcd59430236b336428bbf8e1da16fb87d56e4 (patch) | |
tree | 126b999f1eae9b7ecf1045eec425a6dbcdcb4351 /arch/sh/include/asm | |
parent | bpf: Check flags for branch stack in bpf_read_branch_records helper (diff) | |
parent | Linux 6.0-rc7 (diff) | |
download | linux-dev-a1ebcd59430236b336428bbf8e1da16fb87d56e4.tar.xz linux-dev-a1ebcd59430236b336428bbf8e1da16fb87d56e4.zip |
Merge branch 'v6.0-rc7'
Merge upstream to get RAPTORLAKE_S
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'arch/sh/include/asm')
-rw-r--r-- | arch/sh/include/asm/bitops-op32.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/sh/include/asm/bitops-op32.h b/arch/sh/include/asm/bitops-op32.h index 565a85d8b7fb..5ace89b46507 100644 --- a/arch/sh/include/asm/bitops-op32.h +++ b/arch/sh/include/asm/bitops-op32.h @@ -135,16 +135,8 @@ arch___test_and_change_bit(unsigned long nr, volatile unsigned long *addr) return (old & mask) != 0; } -/** - * arch_test_bit - Determine whether a bit is set - * @nr: bit number to test - * @addr: Address to start counting from - */ -static __always_inline bool -arch_test_bit(unsigned long nr, const volatile unsigned long *addr) -{ - return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1))); -} +#define arch_test_bit generic_test_bit +#define arch_test_bit_acquire generic_test_bit_acquire #include <asm-generic/bitops/non-instrumented-non-atomic.h> |