Message ID | 20170727071429.GA1432@lvm (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index f4e7261..b0426ac 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -912,7 +912,8 @@ static void __init arch_counter_register(unsigned type) /* Register the CP15 based counter if we have one */ if (type & ARCH_TIMER_TYPE_CP15) { - if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI) { + if (arch_timer_uses_ppi == ARCH_TIMER_VIRT_PPI || + (!is_hyp_mode_available() && IS_ENABLED(CONFIG_ARM64))) { arch_timer_read_counter = arch_counter_get_cntvct; } else { arch_timer_read_counter = arch_counter_get_cntpct;