[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1242170724-13349-12-git-send-email-jeremy@goop.org>
Date: Tue, 12 May 2009 16:25:18 -0700
From: Jeremy Fitzhardinge <jeremy@...p.org>
To: Ingo Molnar <mingo@...e.hu>
Cc: the arch/x86 maintainers <x86@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Xen-devel <xen-devel@...ts.xensource.com>,
Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
Subject: [PATCH 11/17] xen: don't setup acpi interrupt unless there is one
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.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@...rix.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists