|
@@ -11,6 +11,7 @@
|
|
|
#include <linux/cpu.h>
|
|
|
#include <linux/pm.h>
|
|
|
#include <linux/io.h>
|
|
|
+#include <linux/irqdomain.h>
|
|
|
|
|
|
#include <asm/fixmap.h>
|
|
|
#include <asm/hpet.h>
|
|
@@ -476,7 +477,7 @@ static int hpet_msi_next_event(unsigned long delta,
|
|
|
static int hpet_setup_msi_irq(unsigned int irq)
|
|
|
{
|
|
|
if (x86_msi.setup_hpet_msi(irq, hpet_blockid)) {
|
|
|
- irq_free_hwirq(irq);
|
|
|
+ irq_domain_free_irqs(irq, 1);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
return 0;
|
|
@@ -484,9 +485,10 @@ static int hpet_setup_msi_irq(unsigned int irq)
|
|
|
|
|
|
static int hpet_assign_irq(struct hpet_dev *dev)
|
|
|
{
|
|
|
- unsigned int irq = irq_alloc_hwirq(-1);
|
|
|
+ int irq;
|
|
|
|
|
|
- if (!irq)
|
|
|
+ irq = irq_domain_alloc_irqs(NULL, 1, NUMA_NO_NODE, NULL);
|
|
|
+ if (irq <= 0)
|
|
|
return -EINVAL;
|
|
|
|
|
|
irq_set_handler_data(irq, dev);
|