diff options
| author | David S. Miller | 2015-01-06 22:29:20 -0500 |
|---|---|---|
| committer | David S. Miller | 2015-01-06 22:29:20 -0500 |
| commit | 44d84d7272e5848878a96029b8a8b6e86854f146 (patch) | |
| tree | 91b188c0ae21255510ace7507d42cdf0e8f6f5ae /drivers/clocksource/arm_arch_timer.c | |
| parent | de7b5b3d790a2524c3f992d357983600635c441b (diff) | |
| parent | bdec41963890f8ed9ad89f8b418959ab3cdc2aa3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 8e67e72f8795..a3025e7ae35f 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -463,7 +463,7 @@ static void __init arch_counter_register(unsigned type) /* Register the CP15 based counter if we have one */ if (type & ARCH_CP15_TIMER) { - if (arch_timer_use_virtual) + if (IS_ENABLED(CONFIG_ARM64) || arch_timer_use_virtual) arch_timer_read_counter = arch_counter_get_cntvct; else arch_timer_read_counter = arch_counter_get_cntpct; |