From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762794AbZE0Hln (ORCPT ); Wed, 27 May 2009 03:41:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761739AbZE0HiI (ORCPT ); Wed, 27 May 2009 03:38:08 -0400 Received: from claw.goop.org ([74.207.240.146]:41734 "EHLO claw.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759329AbZE0HiG (ORCPT ); Wed, 27 May 2009 03:38:06 -0400 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: the arch/x86 maintainers , Linux Kernel Mailing List , Xen-devel , Greg KH , Jens Axboe , Chris Wright , kurt.hackel@oracle.com, Andrew Morton , Ky Srinivasan , Beulich , Linus Torvalds , Avi Kivity , Jeremy Fitzhardinge Subject: [PATCH 11/17] xen: don't setup acpi interrupt unless there is one Date: Wed, 27 May 2009 00:37:24 -0700 Message-Id: <1243409850-21577-12-git-send-email-jeremy@goop.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1243409850-21577-1-git-send-email-jeremy@goop.org> References: <1243409850-21577-1-git-send-email-jeremy@goop.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Fitzhardinge 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 --- 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