diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 05:26:38 -0500 |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /drivers/clocksource/arm_arch_timer.c | |
| parent | ed8f8ce38d0f7b505d7da2d79522972e962457c2 (diff) | |
| parent | 4e1c0664de11e4b5861957ab4ddff2aeeffd042f (diff) | |
Merge branch 'devel-stable' into for-next
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 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) | |||
| 462 | 462 | ||
| 463 | /* Register the CP15 based counter if we have one */ | 463 | /* Register the CP15 based counter if we have one */ |
| 464 | if (type & ARCH_CP15_TIMER) { | 464 | if (type & ARCH_CP15_TIMER) { |
| 465 | if (arch_timer_use_virtual) | 465 | if (IS_ENABLED(CONFIG_ARM64) || arch_timer_use_virtual) |
| 466 | arch_timer_read_counter = arch_counter_get_cntvct; | 466 | arch_timer_read_counter = arch_counter_get_cntvct; |
| 467 | else | 467 | else |
| 468 | arch_timer_read_counter = arch_counter_get_cntpct; | 468 | arch_timer_read_counter = arch_counter_get_cntpct; |