From owner-svn-src-user@FreeBSD.ORG  Wed Nov 25 02:39:33 2009
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 A5D131065679;
	Wed, 25 Nov 2009 02:39:33 +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 95C8B8FC18;
	Wed, 25 Nov 2009 02:39:33 +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 nAP2dXEc036868;
	Wed, 25 Nov 2009 02:39:33 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAP2dXHQ036866;
	Wed, 25 Nov 2009 02:39:33 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911250239.nAP2dXHQ036866@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 25 Nov 2009 02:39:33 +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: r199780 -
	user/kmacy/releng_8_fcs_buf_xen/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: Wed, 25 Nov 2009 02:39:33 -0000

Author: kmacy
Date: Wed Nov 25 02:39:33 2009
New Revision: 199780
URL: http://svn.freebsd.org/changeset/base/199780

Log:
  fix mismerge

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

Modified: user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64/pmap.c	Wed Nov 25 02:39:11 2009	(r199779)
+++ user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64/pmap.c	Wed Nov 25 02:39:33 2009	(r199780)
@@ -1153,8 +1153,7 @@ pmap_qenter_prot(vm_offset_t sva, vm_pag
 	while (pte < endpte) {
 		oldpte |= *pte;
 		pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G |
-		    pmap_cache_bits((*ma)->md.pat_mode, 0) | PG_RW | PG_V);
-		pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | flags);
+		    pmap_cache_bits((*ma)->md.pat_mode, 0) | flags | PG_V);
 		if (prot & VM_PROT_EXCLUDE)
 			dump_exclude_page(VM_PAGE_TO_PHYS(*ma));
 		pte++;
@@ -1174,7 +1173,6 @@ pmap_qenter(vm_offset_t sva, vm_page_t *
 
 }
 
-
 /*
  * This routine tears out page mappings from the
  * kernel -- it is meant only for temporary mappings.