From owner-svn-src-all@FreeBSD.ORG Thu Mar 3 00:43:36 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 55731106564A;
Thu, 3 Mar 2011 00:43:36 +0000 (UTC)
(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 293FC8FC12;
Thu, 3 Mar 2011 00:43:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p230haDJ074950;
Thu, 3 Mar 2011 00:43:36 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id p230hakk074948;
Thu, 3 Mar 2011 00:43:36 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201103030043.p230hakk074948@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 3 Mar 2011 00:43:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r219213 - stable/8/sys/dev/acpica
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Mar 2011 00:43:36 -0000
Author: jkim
Date: Thu Mar 3 00:43:35 2011
New Revision: 219213
URL: http://svn.freebsd.org/changeset/base/219213
Log:
MFC: r218685, r218687
Copy just enough data for the resource type.
Modified:
stable/8/sys/dev/acpica/acpi_resource.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/acpica/acpi_resource.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi_resource.c Thu Mar 3 00:24:55 2011 (r219212)
+++ stable/8/sys/dev/acpica/acpi_resource.c Thu Mar 3 00:43:35 2011 (r219213)
@@ -60,32 +60,35 @@ static ACPI_STATUS
acpi_lookup_irq_handler(ACPI_RESOURCE *res, void *context)
{
struct lookup_irq_request *req;
+ size_t len;
u_int irqnum, irq;
switch (res->Type) {
case ACPI_RESOURCE_TYPE_IRQ:
+ irqnum = res->Data.Irq.InterruptCount;
+ irq = res->Data.Irq.Interrupts[0];
+ len = ACPI_RS_SIZE(ACPI_RESOURCE_IRQ);
+ break;
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
- if (res->Type == ACPI_RESOURCE_TYPE_IRQ) {
- irqnum = res->Data.Irq.InterruptCount;
- irq = res->Data.Irq.Interrupts[0];
- } else {
- irqnum = res->Data.ExtendedIrq.InterruptCount;
- irq = res->Data.ExtendedIrq.Interrupts[0];
- }
- if (irqnum != 1)
- break;
- req = (struct lookup_irq_request *)context;
- if (req->counter != req->rid) {
- req->counter++;
- break;
- }
- req->found = 1;
- KASSERT(irq == rman_get_start(req->res),
- ("IRQ resources do not match"));
- bcopy(res, req->acpi_res, sizeof(ACPI_RESOURCE));
- return (AE_CTRL_TERMINATE);
+ irqnum = res->Data.ExtendedIrq.InterruptCount;
+ irq = res->Data.ExtendedIrq.Interrupts[0];
+ len = ACPI_RS_SIZE(ACPI_RESOURCE_EXTENDED_IRQ);
+ break;
+ default:
+ return (AE_OK);
+ }
+ if (irqnum != 1)
+ return (AE_OK);
+ req = (struct lookup_irq_request *)context;
+ if (req->counter != req->rid) {
+ req->counter++;
+ return (AE_OK);
}
- return (AE_OK);
+ req->found = 1;
+ KASSERT(irq == rman_get_start(req->res),
+ ("IRQ resources do not match"));
+ bcopy(res, req->acpi_res, len);
+ return (AE_CTRL_TERMINATE);
}
ACPI_STATUS