From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH 1/1] - Altix: more ACPI PRT support Date: Fri, 2 Feb 2007 17:37:46 -0800 Message-ID: <20070202173746.9fc66172.akpm@linux-foundation.org> References: <20070202205412.14367.60290.sendpatchset@attica.americas.sgi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from smtp.osdl.org ([65.172.181.24]:49213 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946210AbXBCBjD (ORCPT ); Fri, 2 Feb 2007 20:39:03 -0500 In-Reply-To: <20070202205412.14367.60290.sendpatchset@attica.americas.sgi.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: John Keller Cc: linux-acpi@vger.kernel.org, ayoung@sgi.com, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, Len Brown , "Luck, Tony" On Fri, 02 Feb 2007 14:54:12 -0600 John Keller wrote: > The SN Altix platform does not conform to the > IOSAPIC IRQ routing model. Add code in acpi_unregister_gsi() > to check if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) and > return. > > Signed-off-by: John Keller > --- > > Due to an oversight, this code was not added previously when > similar code was added to acpi_register_gsi(). > > http://marc.theaimsgroup.com/?l=linux-acpi&m=116680983430121&w=2 > > arch/ia64/kernel/acpi.c | 3 +++ > 1 file changed, 3 insertions(+) > > > Index: linux-2.6/arch/ia64/kernel/acpi.c > =================================================================== > --- linux-2.6.orig/arch/ia64/kernel/acpi.c 2007-02-02 14:44:31.000000000 -0600 > +++ linux-2.6/arch/ia64/kernel/acpi.c 2007-02-02 14:47:44.658143727 -0600 > @@ -609,6 +609,9 @@ EXPORT_SYMBOL(acpi_register_gsi); > > void acpi_unregister_gsi(u32 gsi) > { > + if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) > + return; > + > iosapic_unregister_intr(gsi); > } Given that the December 22 patch appears to be in mainline, and that this patch is simple, I shall cheerily bypass maintainers and send it in for 2.6.20.