[PATCH 11/17] xen: don't setup acpi interrupt unless there is one

Jeremy Fitzhardinge
2009-05-12T23:29:26Z

From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

If the SCI hasn't been set, then presumably we're not running
with acpi, don't bother setting up the interrupt.

[ Impact: compatibility with pre-ACPI machines ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
arch/x86/xen/pci.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
index 402a5bd..00ad6df 100644
--- a/arch/x86/xen/pci.c
+++ b/arch/x86/xen/pci.c
@@ -69,13 +69,12 @@ void __init xen_setup_pirqs(void)
/*
* Set up acpi interrupt in acpi_gbl_FADT.sci_interrupt.
*/
- irq = xen_allocate_pirq(acpi_gbl_FADT.sci_interrupt);
+ if (acpi_gbl_FADT.sci_interrupt > 0) {
+ irq = xen_allocate_pirq(acpi_gbl_FADT.sci_interrupt);

- printk(KERN_INFO "xen: allocated irq %d for acpi %d\n",
- irq, acpi_gbl_FADT.sci_interrupt);
-
- /* Blerk. */
- acpi_gbl_FADT.sci_interrupt = irq;
+ printk(KERN_INFO "xen: allocated irq %d for acpi %d\n",
+ irq, acpi_gbl_FADT.sci_interrupt);
+ }
#endif

/* Pre-allocate legacy irqs */
--
1.6.0.6