summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/apic
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r--arch/x86/kernel/apic/msi.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c
index c2b2911feeef..7f7bc6a59527 100644
--- a/arch/x86/kernel/apic/msi.c
+++ b/arch/x86/kernel/apic/msi.c
@@ -479,10 +479,13 @@ struct irq_domain *hpet_create_irq_domain(int hpet_id)
info.type = X86_IRQ_ALLOC_TYPE_HPET;
info.hpet_id = hpet_id;
parent = irq_remapping_get_ir_irq_domain(&info);
- if (parent == NULL)
+ if (parent == NULL) {
parent = x86_vector_domain;
- else
+ } else {
hpet_msi_controller.name = "IR-HPET-MSI";
+ /* Temporary fix: Will go away */
+ hpet_msi_controller.irq_compose_msi_msg = NULL;
+ }
fn = irq_domain_alloc_named_id_fwnode(hpet_msi_controller.name,
hpet_id);