diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 16:25:18 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 16:25:18 -0800 |
| commit | 54b56170e4517e9606b245c3f805fc96baa059f0 (patch) | |
| tree | 9f8750ef972b4a7fdce530889dcbaf2a8b5b0d05 /arch/x86/kernel/acpi | |
| parent | 1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88 (diff) | |
| parent | d02e30c31c57683a66ed68a1bcff900ca78f6d56 (diff) | |
| download | blackbird-op-linux-54b56170e4517e9606b245c3f805fc96baa059f0.tar.gz blackbird-op-linux-54b56170e4517e9606b245c3f805fc96baa059f0.zip | |
Merge remote branch 'origin/x86/apic' into x86/mrst
Conflicts:
arch/x86/kernel/apic/io_apic.c
Diffstat (limited to 'arch/x86/kernel/acpi')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 054a5f5548b0..db2773c6defd 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -447,6 +447,12 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) { *irq = gsi; + +#ifdef CONFIG_X86_IO_APIC + if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) + setup_IO_APIC_irq_extra(gsi); +#endif + return 0; } @@ -474,7 +480,8 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) plat_gsi = mp_register_gsi(dev, gsi, trigger, polarity); } #endif - acpi_gsi_to_irq(plat_gsi, &irq); + irq = plat_gsi; + return irq; } |
