aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/kernel/time.c')
-rw-r--r--arch/x86_64/kernel/time.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index bd5ea09bfdf9..7037ca668c63 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -1138,8 +1138,12 @@ static void hpet_rtc_timer_reinit(void)
1138{ 1138{
1139 unsigned int cfg, cnt; 1139 unsigned int cfg, cnt;
1140 1140
1141 if (!(PIE_on | AIE_on | UIE_on)) 1141 if (unlikely(!(PIE_on | AIE_on | UIE_on))) {
1142 cfg = hpet_readl(HPET_T1_CFG);
1143 cfg &= ~HPET_TN_ENABLE;
1144 hpet_writel(cfg, HPET_T1_CFG);
1142 return; 1145 return;
1146 }
1143 1147
1144 if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ)) 1148 if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ))
1145 hpet_rtc_int_freq = PIE_freq; 1149 hpet_rtc_int_freq = PIE_freq;