aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-04-27 21:01:20 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-28 06:21:17 -0400
commita2f809b08ae4dddc1015c7dcd8659e5729e45b3e (patch)
tree319895181d8004eca93606949fac10ef14a4b1b1 /arch/x86/kernel/acpi
parent85ac16d033370caf6f48d743c8dc8103700f5cc5 (diff)
irq: change ACPI GSI APIs to also take a device argument
We want to use dev_to_node() later on, to be aware of the 'home node' of the GSI in question. [ Impact: cleanup, prepare the IRQ code to be more NUMA aware ] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Len Brown <lenb@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Len Brown <lenb@kernel.org> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Tony Luck <tony.luck@intel.com> Cc: linux-acpi@vger.kernel.org Cc: linux-ia64@vger.kernel.org LKML-Reference: <49F65560.20904@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r--arch/x86/kernel/acpi/boot.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 723989d7f802..6ee96b5530f1 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -522,7 +522,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
522 * success: return IRQ number (>=0) 522 * success: return IRQ number (>=0)
523 * failure: return < 0 523 * failure: return < 0
524 */ 524 */
525int acpi_register_gsi(u32 gsi, int triggering, int polarity) 525int acpi_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity)
526{ 526{
527 unsigned int irq; 527 unsigned int irq;
528 unsigned int plat_gsi = gsi; 528 unsigned int plat_gsi = gsi;
@@ -539,7 +539,7 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
539 539
540#ifdef CONFIG_X86_IO_APIC 540#ifdef CONFIG_X86_IO_APIC
541 if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) { 541 if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
542 plat_gsi = mp_register_gsi(gsi, triggering, polarity); 542 plat_gsi = mp_register_gsi(dev, gsi, triggering, polarity);
543 } 543 }
544#endif 544#endif
545 acpi_gsi_to_irq(plat_gsi, &irq); 545 acpi_gsi_to_irq(plat_gsi, &irq);
@@ -1158,7 +1158,7 @@ void __init mp_config_acpi_legacy_irqs(void)
1158 } 1158 }
1159} 1159}
1160 1160
1161int mp_register_gsi(u32 gsi, int triggering, int polarity) 1161int mp_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity)
1162{ 1162{
1163 int ioapic; 1163 int ioapic;
1164 int ioapic_pin; 1164 int ioapic_pin;
@@ -1253,7 +1253,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
1253 } 1253 }
1254 } 1254 }
1255#endif 1255#endif
1256 io_apic_set_pci_routing(ioapic, ioapic_pin, gsi, 1256 io_apic_set_pci_routing(dev, ioapic, ioapic_pin, gsi,
1257 triggering == ACPI_EDGE_SENSITIVE ? 0 : 1, 1257 triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
1258 polarity == ACPI_ACTIVE_HIGH ? 0 : 1); 1258 polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
1259 return gsi; 1259 return gsi;