aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-25 14:53:11 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:53:12 -0400
commitc81bba49a13cb3376654d0cc93dc069fd619ed76 (patch)
tree04d2296c14c7b452fd49bfb042de568fbad88b48
parentc1370b49cc4f09de5b447ddf688a3988a297dbfc (diff)
x86: print out irq nr for msi/ht, v3
v2: fix hpet compiling error v3: Bjorn want to use dev_printk instead Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/hpet.c3
-rw-r--r--arch/x86/kernel/io_apic.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 422c577ef691..2913913f4a46 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -467,6 +467,9 @@ static int hpet_setup_irq(struct hpet_dev *dev)
467 irq_set_affinity(dev->irq, cpumask_of_cpu(dev->cpu)); 467 irq_set_affinity(dev->irq, cpumask_of_cpu(dev->cpu));
468 enable_irq(dev->irq); 468 enable_irq(dev->irq);
469 469
470 printk(KERN_DEBUG "hpet: %s irq %d for MSI\n",
471 dev->name, dev->irq);
472
470 return 0; 473 return 0;
471} 474}
472 475
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index ed68a6f99dc2..4ee270d30358 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -3354,6 +3354,8 @@ static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc, int irq)
3354#endif 3354#endif
3355 set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq, "edge"); 3355 set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq, "edge");
3356 3356
3357 dev_printk(KERN_DEBUG, &dev->dev, "irq %d for MSI/MSI-X\n", irq);
3358
3357 return 0; 3359 return 0;
3358} 3360}
3359 3361
@@ -3586,6 +3588,7 @@ int arch_setup_hpet_msi(unsigned int irq)
3586 hpet_msi_write(irq, &msg); 3588 hpet_msi_write(irq, &msg);
3587 set_irq_chip_and_handler_name(irq, &hpet_msi_type, handle_edge_irq, 3589 set_irq_chip_and_handler_name(irq, &hpet_msi_type, handle_edge_irq,
3588 "edge"); 3590 "edge");
3591
3589 return 0; 3592 return 0;
3590} 3593}
3591#endif 3594#endif
@@ -3682,6 +3685,8 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)
3682 3685
3683 set_irq_chip_and_handler_name(irq, &ht_irq_chip, 3686 set_irq_chip_and_handler_name(irq, &ht_irq_chip,
3684 handle_edge_irq, "edge"); 3687 handle_edge_irq, "edge");
3688
3689 dev_printk(KERN_DEBUG, &dev->dev, "irq %d for HT\n", irq);
3685 } 3690 }
3686 return err; 3691 return err;
3687} 3692}