aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/hpet.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/hpet.c')
-rw-r--r--arch/x86/kernel/hpet.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index ba575f0f2e34..7f024ff47d1d 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -33,6 +33,7 @@
33 * HPET address is set in acpi/boot.c, when an ACPI entry exists 33 * HPET address is set in acpi/boot.c, when an ACPI entry exists
34 */ 34 */
35unsigned long hpet_address; 35unsigned long hpet_address;
36u8 hpet_blockid; /* OS timer block num */
36#ifdef CONFIG_PCI_MSI 37#ifdef CONFIG_PCI_MSI
37static unsigned long hpet_num_timers; 38static unsigned long hpet_num_timers;
38#endif 39#endif
@@ -467,7 +468,7 @@ static int hpet_msi_next_event(unsigned long delta,
467 468
468static int hpet_setup_msi_irq(unsigned int irq) 469static int hpet_setup_msi_irq(unsigned int irq)
469{ 470{
470 if (arch_setup_hpet_msi(irq)) { 471 if (arch_setup_hpet_msi(irq, hpet_blockid)) {
471 destroy_irq(irq); 472 destroy_irq(irq);
472 return -EINVAL; 473 return -EINVAL;
473 } 474 }