From owner-svn-src-all@FreeBSD.ORG  Tue Nov  2 20:16:41 2010
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 681871065672;
	Tue,  2 Nov 2010 20:16:41 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 56E7D8FC1E;
	Tue,  2 Nov 2010 20:16:41 +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 oA2KGfrt083195;
	Tue, 2 Nov 2010 20:16:41 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA2KGfOP083193;
	Tue, 2 Nov 2010 20:16:41 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201011022016.oA2KGfOP083193@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 2 Nov 2010 20:16:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214686 - head/sys/x86/x86
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 &quot;
	user&quot; and &quot; projects&quot; \)" <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: Tue, 02 Nov 2010 20:16:41 -0000

Author: jhb
Date: Tue Nov  2 20:16:41 2010
New Revision: 214686
URL: http://svn.freebsd.org/changeset/base/214686

Log:
  Cosmetic change to revert one of my earlier ones.
  #if __i386__ && PAE is identical to just #if PAE since PAE is only a valid
  option for i386.
  
  Submitted by:	attilio

Modified:
  head/sys/x86/x86/nexus.c

Modified: head/sys/x86/x86/nexus.c
==============================================================================
--- head/sys/x86/x86/nexus.c	Tue Nov  2 20:06:49 2010	(r214685)
+++ head/sys/x86/x86/nexus.c	Tue Nov  2 20:16:41 2010	(r214686)
@@ -728,7 +728,7 @@ ram_attach(device_t dev)
 	 * segment is 0.
 	 */
 	for (rid = 0, p = dump_avail; p[1] != 0; rid++, p += 2) {
-#if defined(__i386__) && defined(PAE)
+#ifdef PAE
 		/*
 		 * Resources use long's to track resources, so we can't
 		 * include memory regions above 4GB.