From owner-p4-projects@FreeBSD.ORG  Fri May 13 21:45:15 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 17D3A106566B; Fri, 13 May 2011 21:45:15 +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 CEA9E1065672
	for <perforce@freebsd.org>; Fri, 13 May 2011 21:45:14 +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 BD4F78FC14
	for <perforce@freebsd.org>; Fri, 13 May 2011 21:45:14 +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 p4DLjEx8056484
	for <perforce@freebsd.org>; Fri, 13 May 2011 21:45:14 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4DLjEhO056481
	for perforce@freebsd.org; Fri, 13 May 2011 21:45:14 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 13 May 2011 21:45:14 GMT
Message-Id: <201105132145.p4DLjEhO056481@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 193084 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: Fri, 13 May 2011 21:45:15 -0000

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

Change 193084 by jhb@jhb_jhbbsd on 2011/05/13 21:45:10

	Compile.

Affected files ...

.. //depot/projects/pci/sys/x86/x86/nexus.c#9 edit

Differences ...

==== //depot/projects/pci/sys/x86/x86/nexus.c#9 (text+ko) ====

@@ -58,6 +58,7 @@
 #include <machine/bus.h>
 #include <machine/intr_machdep.h>
 #include <sys/rman.h>
+#include <sys/sysctl.h>
 #include <sys/interrupt.h>
 
 #include <machine/vmparam.h>
@@ -875,15 +876,15 @@
 
 static unsigned long host_mem_start = 0x80000000;
 TUNABLE_ULONG("hw.pci.host_mem_start", &host_mem_start);
-SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &host_mem_start, 0,
-    "Limit the host bridge memory to being above this address.");
+SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &host_mem_start,
+    0, "Limit the host bridge memory to being above this address.");
 
 u_long
 hostb_alloc_start(int type, u_long start, u_long end, u_long count)
 {
 
 	if (start + count - 1 != end) {
-		if (type == SYS_RES_MEMORY && start < acpi_host_mem_start)
+		if (type == SYS_RES_MEMORY && start < host_mem_start)
 			start = host_mem_start;
 		if (type == SYS_RES_IOPORT && start < 0x1000)
 			start = 0x1000;