aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/hpet.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 9ec2ab793042..786aa227afdf 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -117,8 +117,7 @@ int is_hpet_enabled(void)
117static void hpet_reserve_platform_timers(unsigned long id) 117static void hpet_reserve_platform_timers(unsigned long id)
118{ 118{
119 struct hpet __iomem *hpet = hpet_virt_address; 119 struct hpet __iomem *hpet = hpet_virt_address;
120 struct hpet_timer __iomem *timer = &hpet->hpet_timers[2]; 120 unsigned int nrtimers;
121 unsigned int nrtimers, i;
122 struct hpet_data hd; 121 struct hpet_data hd;
123 122
124 nrtimers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1; 123 nrtimers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1;
@@ -133,16 +132,14 @@ static void hpet_reserve_platform_timers(unsigned long id)
133#ifdef CONFIG_HPET_EMULATE_RTC 132#ifdef CONFIG_HPET_EMULATE_RTC
134 hpet_reserve_timer(&hd, 1); 133 hpet_reserve_timer(&hd, 1);
135#endif 134#endif
136
137 hd.hd_irq[0] = HPET_LEGACY_8254; 135 hd.hd_irq[0] = HPET_LEGACY_8254;
138 hd.hd_irq[1] = HPET_LEGACY_RTC; 136 hd.hd_irq[1] = HPET_LEGACY_RTC;
139 137
140 for (i = 2; i < nrtimers; timer++, i++) 138 /*
141 hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >> 139 * IRQs for the other timers are assigned dynamically
142 Tn_INT_ROUTE_CNF_SHIFT; 140 * in hpet_alloc
143 141 */
144 hpet_alloc(&hd); 142 hpet_alloc(&hd);
145
146} 143}
147#else 144#else
148static void hpet_reserve_platform_timers(unsigned long id) { } 145static void hpet_reserve_platform_timers(unsigned long id) { }