From owner-svn-src-user@FreeBSD.ORG  Fri Apr 23 06:01:26 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86CE2106564A;
	Fri, 23 Apr 2010 06:01:26 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 76DB98FC13;
	Fri, 23 Apr 2010 06:01:26 +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 o3N61QZn011429;
	Fri, 23 Apr 2010 06:01:26 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3N61QPf011427;
	Fri, 23 Apr 2010 06:01:26 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004230601.o3N61QPf011427@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 23 Apr 2010 06:01:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207097 - user/kmacy/head_page_lock_2/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Apr 2010 06:01:26 -0000

Author: kmacy
Date: Fri Apr 23 06:01:26 2010
New Revision: 207097
URL: http://svn.freebsd.org/changeset/base/207097

Log:
  - don't check page queue in get_pv_entry it no longer applies
  - add comment about pv_list in demote

Modified:
  user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c

Modified: user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c	Fri Apr 23 03:37:39 2010	(r207096)
+++ user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c	Fri Apr 23 06:01:26 2010	(r207097)
@@ -2272,8 +2272,7 @@ get_pv_entry(pmap_t pmap)
 		}
 	}
 	/* No free items, allocate another chunk */
-	m = vm_page_alloc(NULL, colour, (pq == &vm_page_queues[PQ_ACTIVE] ?
-	    VM_ALLOC_SYSTEM : VM_ALLOC_NORMAL) | VM_ALLOC_NOOBJ |
+	m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ |
 	    VM_ALLOC_WIRED);
 	if (m == NULL) {
 		PV_STAT(pc_chunk_tryfail++);
@@ -2738,6 +2737,11 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t 
 			PA_UNLOCK(pa);
 	}
 	if (pmap == kernel_pmap) {
+		/*
+		 *
+		 * Our inability to fail here implies that we should
+		 * always be passed a pv_list if pmap == kernel_pmap
+		 */
 		if (!pmap_demote_pde(pmap, pdq, sva, pv_list))
 			panic("pmap_remove_pde: failed demotion");
 	} else {