tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
asm-generic/bitops: Use instrument_read_write() where appropriate
Use the new instrument_read_write() where appropriate.
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
authored by
Marco Elver
and committed by
Paul E. McKenney
b159eecc
00047c2e
+7
-7
+3
-3
include/asm-generic/bitops/instrumented-atomic.h
+3
-3
include/asm-generic/bitops/instrumented-atomic.h
···
67
67
*/
68
68
static inline bool test_and_set_bit(long nr, volatile unsigned long *addr)
69
69
{
70
-
instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));
70
+
instrument_atomic_read_write(addr + BIT_WORD(nr), sizeof(long));
71
71
return arch_test_and_set_bit(nr, addr);
72
72
}
73
73
···
80
80
*/
81
81
static inline bool test_and_clear_bit(long nr, volatile unsigned long *addr)
82
82
{
83
-
instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));
83
+
instrument_atomic_read_write(addr + BIT_WORD(nr), sizeof(long));
84
84
return arch_test_and_clear_bit(nr, addr);
85
85
}
86
86
···
93
93
*/
94
94
static inline bool test_and_change_bit(long nr, volatile unsigned long *addr)
95
95
{
96
-
instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));
96
+
instrument_atomic_read_write(addr + BIT_WORD(nr), sizeof(long));
97
97
return arch_test_and_change_bit(nr, addr);
98
98
}
99
99
+1
-1
include/asm-generic/bitops/instrumented-lock.h
+1
-1
include/asm-generic/bitops/instrumented-lock.h
···
52
52
*/
53
53
static inline bool test_and_set_bit_lock(long nr, volatile unsigned long *addr)
54
54
{
55
-
instrument_atomic_write(addr + BIT_WORD(nr), sizeof(long));
55
+
instrument_atomic_read_write(addr + BIT_WORD(nr), sizeof(long));
56
56
return arch_test_and_set_bit_lock(nr, addr);
57
57
}
58
58
+3
-3
include/asm-generic/bitops/instrumented-non-atomic.h
+3
-3
include/asm-generic/bitops/instrumented-non-atomic.h
···
68
68
*/
69
69
static inline bool __test_and_set_bit(long nr, volatile unsigned long *addr)
70
70
{
71
-
instrument_write(addr + BIT_WORD(nr), sizeof(long));
71
+
instrument_read_write(addr + BIT_WORD(nr), sizeof(long));
72
72
return arch___test_and_set_bit(nr, addr);
73
73
}
74
74
···
82
82
*/
83
83
static inline bool __test_and_clear_bit(long nr, volatile unsigned long *addr)
84
84
{
85
-
instrument_write(addr + BIT_WORD(nr), sizeof(long));
85
+
instrument_read_write(addr + BIT_WORD(nr), sizeof(long));
86
86
return arch___test_and_clear_bit(nr, addr);
87
87
}
88
88
···
96
96
*/
97
97
static inline bool __test_and_change_bit(long nr, volatile unsigned long *addr)
98
98
{
99
-
instrument_write(addr + BIT_WORD(nr), sizeof(long));
99
+
instrument_read_write(addr + BIT_WORD(nr), sizeof(long));
100
100
return arch___test_and_change_bit(nr, addr);
101
101
}
102
102