diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 4434e154f596..74102796e5c0 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -915,7 +915,7 @@ void __init time_init(void) | |||
915 | cpu_khz = hpet_calibrate_tsc(); | 915 | cpu_khz = hpet_calibrate_tsc(); |
916 | timename = "HPET"; | 916 | timename = "HPET"; |
917 | #ifdef CONFIG_X86_PM_TIMER | 917 | #ifdef CONFIG_X86_PM_TIMER |
918 | } else if (pmtmr_ioport) { | 918 | } else if (pmtmr_ioport && !vxtime.hpet_address) { |
919 | vxtime_hz = PM_TIMER_FREQUENCY; | 919 | vxtime_hz = PM_TIMER_FREQUENCY; |
920 | timename = "PM"; | 920 | timename = "PM"; |
921 | pit_init(); | 921 | pit_init(); |