From owner-svn-src-all@FreeBSD.ORG Sat Apr 24 03:11:36 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18F9D1065670; Sat, 24 Apr 2010 03:11:36 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0703B8FC15; Sat, 24 Apr 2010 03:11:36 +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 o3O3BZIv004149; Sat, 24 Apr 2010 03:11:35 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3O3BZSa004146; Sat, 24 Apr 2010 03:11:35 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004240311.o3O3BZSa004146@svn.freebsd.org> From: Juli Mallett Date: Sat, 24 Apr 2010 03:11:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207139 - in head/sys/mips: include mips X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2010 03:11:36 -0000 Author: jmallett Date: Sat Apr 24 03:11:35 2010 New Revision: 207139 URL: http://svn.freebsd.org/changeset/base/207139 Log: Most MIPS systems have a comparatively-sparse physical memory layout. Switch to using the sparse physseg layout in the VM system. Modified: head/sys/mips/include/vmparam.h head/sys/mips/mips/pmap.c Modified: head/sys/mips/include/vmparam.h ============================================================================== --- head/sys/mips/include/vmparam.h Sat Apr 24 00:53:41 2010 (r207138) +++ head/sys/mips/include/vmparam.h Sat Apr 24 03:11:35 2010 (r207139) @@ -152,9 +152,9 @@ #define VM_PHYSSEG_MAX 32 /* - * The physical address space is densely populated. + * The physical address space is sparsely populated. */ -#define VM_PHYSSEG_DENSE +#define VM_PHYSSEG_SPARSE /* * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool Modified: head/sys/mips/mips/pmap.c ============================================================================== --- head/sys/mips/mips/pmap.c Sat Apr 24 00:53:41 2010 (r207138) +++ head/sys/mips/mips/pmap.c Sat Apr 24 03:11:35 2010 (r207139) @@ -2381,8 +2381,7 @@ pmap_remove_pages(pmap_t pmap) *pte = is_kernel_pmap(pmap) ? PTE_G : 0; m = PHYS_TO_VM_PAGE(mips_tlbpfn_to_paddr(tpte)); - - KASSERT(m < &vm_page_array[vm_page_array_size], + KASSERT(m != NULL, ("pmap_remove_pages: bad tpte %x", tpte)); pv->pv_pmap->pm_stats.resident_count--; @@ -2984,10 +2983,12 @@ page_is_managed(vm_offset_t pa) { vm_offset_t pgnum = mips_btop(pa); - if (pgnum >= first_page && (pgnum < (first_page + vm_page_array_size))) { + if (pgnum >= first_page) { vm_page_t m; m = PHYS_TO_VM_PAGE(pa); + if (m == NULL) + return 0; if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) return 1; }