From owner-svn-src-stable@FreeBSD.ORG  Thu Dec  3 19:37:53 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3644106566C;
	Thu,  3 Dec 2009 19:37:52 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E1C648FC08;
	Thu,  3 Dec 2009 19:37:52 +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 nB3JbqgO023833;
	Thu, 3 Dec 2009 19:37:52 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB3Jbq4O023831;
	Thu, 3 Dec 2009 19:37:52 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <200912031937.nB3Jbq4O023831@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Thu, 3 Dec 2009 19:37:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200078 - stable/7/sys/amd64/include
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Dec 2009 19:37:53 -0000

Author: fabient
Date: Thu Dec  3 19:37:52 2009
New Revision: 200078
URL: http://svn.freebsd.org/changeset/base/200078

Log:
  MFC 179886: Complete the merge after hwpmc backport.
  
  Make preparations for increasing the size of the kernel virtual
  address space on the amd64 architecture.  The amd64 architecture
  requires kernel code and global variables to reside in the highest 2GB
  of the 64-bit virtual address space.  Thus, KERNBASE cannot change.
  However, KERNBASE is sometimes used as the start of the kernel virtual
  address space.  Henceforth, VM_MIN_KERNEL_ADDRESS should be used
  instead.  Since KERNBASE and VM_MIN_KERNEL_ADDRESS are still the same
  address, there should be no visible effect from this change (yet).

Modified:
  stable/7/sys/amd64/include/pmc_mdep.h

Modified: stable/7/sys/amd64/include/pmc_mdep.h
==============================================================================
--- stable/7/sys/amd64/include/pmc_mdep.h	Thu Dec  3 19:27:12 2009	(r200077)
+++ stable/7/sys/amd64/include/pmc_mdep.h	Thu Dec  3 19:37:52 2009	(r200078)
@@ -104,8 +104,8 @@ union pmc_md_pmc {
 
 #define	PMC_IN_KERNEL_STACK(S,START,END)		\
 	((S) >= (START) && (S) < (END))
-#define	PMC_IN_KERNEL(va) (((va) >= DMAP_MIN_ADDRESS &&		\
-	(va) < DMAP_MAX_ADDRESS) || ((va) >= KERNBASE &&	\
+#define	PMC_IN_KERNEL(va) (((va) >= DMAP_MIN_ADDRESS &&			\
+	(va) < DMAP_MAX_ADDRESS) || ((va) >= VM_MIN_KERNEL_ADDRESS &&	\
 	(va) < VM_MAX_KERNEL_ADDRESS))
 
 #define	PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)