CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Feb 16 18:58:58 UTC 2012

Modified Files:
        src/sys/arch/mips/mips [matt-nb5-mips64]: mips_machdep.c vm_machdep.c

Log Message:
mips_nfreelist is the one past the highest freelist used.


To generate a diff of this commit:
cvs rdiff -u -r1.205.4.1.2.1.2.66 -r1.205.4.1.2.1.2.67 \
    src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.121.6.1.2.28 -r1.121.6.1.2.29 \
    src/sys/arch/mips/mips/vm_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.66 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.67
--- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.66	Tue Feb 14 01:51:11 2012
+++ src/sys/arch/mips/mips/mips_machdep.c	Thu Feb 16 18:58:57 2012
@@ -2392,7 +2392,7 @@ mips_page_physload(vaddr_t vkernstart, v
 	/*
 	 * Now to get the number of freelists in use.
 	 */
-	mips_nfreelist = popcount32(mips_freelist_mask);
+	mips_nfreelist = 32 - __builtin_clz(mips_freelist_mask);
 }
 
 /* 

Index: src/sys/arch/mips/mips/vm_machdep.c
diff -u src/sys/arch/mips/mips/vm_machdep.c:1.121.6.1.2.28 src/sys/arch/mips/mips/vm_machdep.c:1.121.6.1.2.29
--- src/sys/arch/mips/mips/vm_machdep.c:1.121.6.1.2.28	Tue Feb 14 01:51:12 2012
+++ src/sys/arch/mips/mips/vm_machdep.c	Thu Feb 16 18:58:57 2012
@@ -102,7 +102,7 @@ mips_page_to_pggroup(struct vm_page *pg,
 		lcv = VM_FREELIST_DEFAULT;
 	}
 	KDASSERT(lcv == uvm_page_lookup_freelist(pg));
-	KASSERT(lcv < mips_nfreelist);
+	KASSERT((1 << lcv) & mips_freelist_mask);
 	return lcv * ncolors + color;
 #endif
 }