diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-26 13:06:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-26 13:06:35 +1100 |
| commit | 928f08b1e26ae0946427b2856a7dc16cd6058400 (patch) | |
| tree | ed93d797301a7007498f58659c94b8f4dd9465af /drivers | |
| parent | 545aaefefdf4148cf5da58a995dc242aebae506b (diff) | |
| parent | d6ad36913083d683aad4e02e53580c995f1a6ede (diff) | |
Merge remote-tracking branch 'arm-soc/for-next'
Diffstat (limited to 'drivers')
| -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 6a79fc4f900c..095c1774592c 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -462,7 +462,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; |