From owner-p4-projects@FreeBSD.ORG  Mon Jan 30 19:19:03 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D01191065678; Mon, 30 Jan 2012 19:19:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92C6F106566C
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 19:19:02 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 7FF388FC0C
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 19:19:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0UJJ2ML088540
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 19:19:02 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0UJJ2p3088537
	for perforce@freebsd.org; Mon, 30 Jan 2012 19:19:02 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 30 Jan 2012 19:19:02 GMT
Message-Id: <201201301919.q0UJJ2p3088537@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 205416 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jan 2012 19:19:03 -0000

http://p4web.freebsd.org/@@205416?ac=10

Change 205416 by jhb@jhb_jhbbsd on 2012/01/30 19:18:57

	Account for mismerge.

Affected files ...

.. //depot/projects/multipass/sys/dev/acpica/acpi.c#10 edit

Differences ...

==== //depot/projects/multipass/sys/dev/acpica/acpi.c#10 (text+ko) ====

@@ -1117,38 +1117,6 @@
     return (0);
 }
 
-static int
-acpi_set_resource(device_t dev, device_t child, int type, int rid,
-    u_long start, u_long count)
-{
-    struct acpi_device *ad = device_get_ivars(child);
-    struct resource_list *rl = &ad->ad_rl;
-    char *pcilink_ids[] = { "PNP0C0F", NULL };
-    char *sysres_ids[] = { "PNP0C01", "PNP0C02", NULL };
-    u_long end;
-    
-    /* Ignore IRQ resources for PCI link devices. */
-    if (type == SYS_RES_IRQ && ACPI_ID_PROBE(dev, child, pcilink_ids) != NULL)
-	return (0);
-
-    /* Add the resource. */
-    end = (start + count - 1);
-    resource_list_add(rl, type, rid, start, end, count);
-
-    /* Don't reserve system resources. */
-    if (ACPI_ID_PROBE(dev, child, sysres_ids) != NULL)
-	return (0);
-
-    /*
-     * Reserve the resource.
-     *
-     * XXX: Ignores failure for now.  Failure here is probably a
-     * BIOS/firmware bug?
-     */
-    resource_list_reserve(rl, dev, child, type, &rid, start, end, count, 0);
-    return (0);
-}
-
 static char *pcilink_ids[] = { "PNP0C0F", NULL };
 static char *sysres_ids[] = { "PNP0C01", "PNP0C02", NULL };
 
@@ -1848,12 +1816,9 @@
 
     /*
      * 3. Embedded controllers (to handle early accesses)
-     * 4. PCI Link Devices (XXX: still?)
      */
     if (acpi_MatchHid(handle, "PNP0C09"))
 	*order = 3;
-    else if (acpi_MatchHid(handle, "PNP0C0F"))
-	*order = 4;
 }
 
 /*