diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2019-04-08 17:49:06 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-04-30 17:11:47 +0200 |
| commit | a862fc2254bdbcee3b5da4f730984e5d8393a2f1 (patch) | |
| tree | 2ffc91823d98d9631237995c9ef7866de5eb0edb /arch | |
| parent | clocksource/arm_arch_timer: Drop use of static key in arch_timer_reg_read_stable (diff) | |
| download | linux-a862fc2254bdbcee3b5da4f730984e5d8393a2f1.tar.xz linux-a862fc2254bdbcee3b5da4f730984e5d8393a2f1.zip | |
clocksource/arm_arch_timer: Remove use of workaround static key
The use of a static key in a hotplug path has proved to be a real
nightmare, and makes it impossible to have scream-free lockdep
kernel.
Let's remove the static key altogether, and focus on something saner.
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/arch_timer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 4a06d46def7e..5502ea049b63 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -45,13 +45,9 @@ (__wa && __wa->h) ? __wa->h : arch_timer_##h; \ }) -extern struct static_key_false arch_timer_read_ool_enabled; -#define needs_unstable_timer_counter_workaround() \ - static_branch_unlikely(&arch_timer_read_ool_enabled) #else #define has_erratum_handler(h) false #define erratum_handler(h) (arch_timer_##h) -#define needs_unstable_timer_counter_workaround() false #endif enum arch_timer_erratum_match_type { |