From owner-svn-src-user@FreeBSD.ORG Sun Apr 25 23:49:32 2010 Return-Path: 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 60B321065676; Sun, 25 Apr 2010 23:49:32 +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 505068FC08; Sun, 25 Apr 2010 23:49:32 +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 o3PNnWmQ007519; Sun, 25 Apr 2010 23:49:32 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3PNnWEd007517; Sun, 25 Apr 2010 23:49:32 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201004252349.o3PNnWEd007517@svn.freebsd.org> From: Kip Macy Date: Sun, 25 Apr 2010 23:49:32 +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: r207212 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2010 23:49:32 -0000 Author: kmacy Date: Sun Apr 25 23:49:32 2010 New Revision: 207212 URL: http://svn.freebsd.org/changeset/base/207212 Log: white space normalization 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 Sun Apr 25 23:42:23 2010 (r207211) +++ user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c Sun Apr 25 23:49:32 2010 (r207212) @@ -247,7 +247,7 @@ static caddr_t crashdumpmap; static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap); -static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, +static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, struct pv_list_head *pv_list); static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); @@ -305,10 +305,6 @@ static vm_offset_t pmap_kmem_choose(vm_o CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); - -#ifdef INVARIANTS -extern void kdb_backtrace(void); -#endif /* * Move the kernel virtual free pointer to the next * 2MB. This is used to help improve performance @@ -1845,6 +1841,7 @@ _pmap_allocpte(pmap_t pmap, vm_paddr_t p pd = &pd[ptepindex & ((1ul << NPDEPGSHIFT) - 1)]; *pd = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } + pmap_resident_count_inc(pmap, 1); return (m); @@ -2222,7 +2219,6 @@ get_pv_entry(pmap_t pmap) pv = &pc->pc_pventry[0]; TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); PV_STAT(pv_entry_spare += _NPCPV - 1); - return (pv); } @@ -2937,7 +2933,6 @@ restart: for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, sva += PAGE_SIZE) { - if (*pte == 0) continue;