From owner-svn-src-head@FreeBSD.ORG  Wed Jul  3 23:38:38 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9B1CFA00;
 Wed,  3 Jul 2013 23:38:38 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8DEEF1ECD;
 Wed,  3 Jul 2013 23:38:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63NccGp063512;
 Wed, 3 Jul 2013 23:38:38 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63Nccgu063509;
 Wed, 3 Jul 2013 23:38:38 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201307032338.r63Nccgu063509@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Wed, 3 Jul 2013 23:38:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252653 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jul 2013 23:38:38 -0000

Author: neel
Date: Wed Jul  3 23:38:37 2013
New Revision: 252653
URL: http://svnweb.freebsd.org/changeset/base/252653

Log:
  vm_phys_fictitious_reg_range() was losing the 'memattr' because it would be
  reset by pmap_page_init() right after being initialized in vm_page_initfake().
  
  The statement above is with reference to the amd64 implementation of
  pmap_page_init().
  
  Fix this by calling 'pmap_page_init()' in 'vm_page_initfake()' before changing
  the 'memattr'.
  
  Reviewed by:	kib
  MFC after:	2 weeks

Modified:
  head/sys/vm/vm_page.c
  head/sys/vm/vm_phys.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Wed Jul  3 23:38:02 2013	(r252652)
+++ head/sys/vm/vm_page.c	Wed Jul  3 23:38:37 2013	(r252653)
@@ -645,6 +645,7 @@ vm_page_initfake(vm_page_t m, vm_paddr_t
 	/* Fictitious pages don't use "order" or "pool". */
 	m->oflags = VPO_BUSY | VPO_UNMANAGED;
 	m->wire_count = 1;
+	pmap_page_init(m);
 memattr:
 	pmap_page_set_memattr(m, memattr);
 }

Modified: head/sys/vm/vm_phys.c
==============================================================================
--- head/sys/vm/vm_phys.c	Wed Jul  3 23:38:02 2013	(r252652)
+++ head/sys/vm/vm_phys.c	Wed Jul  3 23:38:37 2013	(r252653)
@@ -559,7 +559,6 @@ vm_phys_fictitious_reg_range(vm_paddr_t 
 	}
 	for (i = 0; i < page_count; i++) {
 		vm_page_initfake(&fp[i], start + PAGE_SIZE * i, memattr);
-		pmap_page_init(&fp[i]);
 		fp[i].oflags &= ~(VPO_BUSY | VPO_UNMANAGED);
 	}
 	mtx_lock(&vm_phys_fictitious_reg_mtx);