Module Name: src
Committed By: matt
Date: Sat Feb 15 10:19:14 UTC 2014
Modified Files:
src/sys/uvm [matt-nb5-mips64]: uvm_page.c uvm_pglist.c
Log Message:
Adapt to K{,D}ASSERTMSG changes
To generate a diff of this commit:
cvs rdiff -u -r1.140.6.3.4.10 -r1.140.6.3.4.11 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.42.16.13 -r1.42.16.14 src/sys/uvm/uvm_pglist.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/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.140.6.3.4.10 src/sys/uvm/uvm_page.c:1.140.6.3.4.11
--- src/sys/uvm/uvm_page.c:1.140.6.3.4.10 Wed Feb 29 18:03:39 2012
+++ src/sys/uvm/uvm_page.c Sat Feb 15 10:19:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.140.6.3.4.10 2012/02/29 18:03:39 matt Exp $ */
+/* $NetBSD: uvm_page.c,v 1.140.6.3.4.11 2014/02/15 10:19:14 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.140.6.3.4.10 2012/02/29 18:03:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.140.6.3.4.11 2014/02/15 10:19:14 matt Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -843,7 +843,6 @@ uvm_page_physload(paddr_t start, paddr_t
for (lcv = 0, paddr = ptoa(start) ;
lcv < npages ; lcv++, paddr += PAGE_SIZE) {
pgs[lcv].phys_addr = paddr;
- pgs[lcv].free_list = free_list;
if (atop(paddr) >= avail_start &&
atop(paddr) <= avail_end)
uvm_pagefree(&pgs[lcv]);
@@ -1176,8 +1175,8 @@ uvm_pagealloc_pgfl(struct uvm_cpu *ucpu,
/* global, try2 */
if ((pg = LIST_FIRST(&gfreeq[try2])) != NULL) {
KASSERTMSG(pg->pqflags & PQ_FREE,
- ("%s: pg %p in q %p not free!",
- __func__, pg, &gfreeq[try2]));
+ "%s: pg %p in q %p not free!",
+ __func__, pg, &gfreeq[try2]);
KASSERT(gpgfl->pgfl_pages[try2] > 0);
ucpu = VM_FREE_PAGE_TO_CPU(pg);
#ifndef MULTIPROCESSOR
@@ -1205,18 +1204,18 @@ uvm_pagealloc_pgfl(struct uvm_cpu *ucpu,
u_int i = 0;
do {
KASSERTMSG(LIST_NEXT(xpg, pageq.list) == LIST_NEXT(xpg, listq.list),
- ("%s: color %d free_list %d pg %p (%u): next %p/%p",
+ "%s: color %d free_list %d pg %p (%u): next %p/%p",
__func__, color, free_list, xpg, i,
LIST_NEXT(xpg, pageq.list),
- LIST_NEXT(xpg, listq.list)));
+ LIST_NEXT(xpg, listq.list));
} while (++i < 500 && (xpg = LIST_NEXT(xpg, pageq.list)) != NULL);
}
#else
KASSERTMSG(LIST_NEXT(pg, pageq.list) == LIST_NEXT(pg, listq.list),
- ("%s: color %d free_list %d pg %p: next %p/%p",
+ "%s: color %d free_list %d pg %p: next %p/%p",
__func__, color, free_list, pg,
LIST_NEXT(pg, pageq.list),
- LIST_NEXT(pg, listq.list)));
+ LIST_NEXT(pg, listq.list));
#endif
#endif
LIST_REMOVE(pg, pageq.list); /* global list */
Index: src/sys/uvm/uvm_pglist.c
diff -u src/sys/uvm/uvm_pglist.c:1.42.16.13 src/sys/uvm/uvm_pglist.c:1.42.16.14
--- src/sys/uvm/uvm_pglist.c:1.42.16.13 Wed Feb 29 18:03:40 2012
+++ src/sys/uvm/uvm_pglist.c Sat Feb 15 10:19:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pglist.c,v 1.42.16.13 2012/02/29 18:03:40 matt Exp $ */
+/* $NetBSD: uvm_pglist.c,v 1.42.16.14 2014/02/15 10:19:14 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.42.16.13 2012/02/29 18:03:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.42.16.14 2014/02/15 10:19:14 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -204,22 +204,22 @@ uvm_pglistalloc_c_ps(struct vm_physseg *
* Make sure this is a managed physical page.
*/
KDASSERTMSG(vm_physseg_find(try, &cidx) == ps - vm_physmem,
- ("%s: %s(%#x, &cidx) (%d) != ps - vm_physmem (%zd)",
+ "%s: %s(%#x, &cidx) (%d) != ps - vm_physmem (%zd)",
__func__, "vm_physseg_find", try,
- vm_physseg_find(try, &cidx), ps - vm_physmem));
+ vm_physseg_find(try, &cidx), ps - vm_physmem);
KDASSERTMSG(cidx == try - ps->start,
- ("%s: cidx (%#x) != try (%#x) - ps->start (%#"PRIxPADDR")",
- __func__, cidx, try, ps->start));
+ "%s: cidx (%#x) != try (%#x) - ps->start (%#"PRIxPADDR")",
+ __func__, cidx, try, ps->start);
KDASSERTMSG(vm_physseg_find(try + num - 1, &cidx) == ps - vm_physmem,
- ("%s: %s(%#x + %#x - 1, &cidx) (%d) != ps - vm_physmem (%zd)",
- __func__, "vm_physseg_find", try, num,
- vm_physseg_find(try, &cidx), ps - vm_physmem));
+ "%s: %s(%#x + %#x - 1, &cidx) (%d) != ps - vm_physmem (%zd)",
+ __func__, "vm_physseg_find", try, num,
+ vm_physseg_find(try, &cidx), ps - vm_physmem);
KDASSERTMSG(cidx == try - ps->start + num - 1,
- ("%s: cidx (%#x) != try (%#x) - ps->start (%#"PRIxPADDR") + num (%#x) - 1",
- __func__, cidx, try, ps->start, num));
+ "%s: cidx (%#x) != try (%#x) - ps->start (%#"PRIxPADDR") + num (%#x) - 1",
+ __func__, cidx, try, ps->start, num);
tryidx = try - ps->start;
end = tryidx + num;
@@ -414,8 +414,8 @@ uvm_pglistalloc_s_ps(struct vm_physseg *
for (;; try++, pg++) {
KDASSERTMSG(limit <= ps->avail_end,
- ("%s: limit (%#x) > ps->avail_end (%#"PRIxPADDR")",
- __func__, limit, ps->avail_end));
+ "%s: limit (%#x) > ps->avail_end (%#"PRIxPADDR")",
+ __func__, limit, ps->avail_end);
if (try >= limit) {
if (ps->start_hint == 0 || second_pass)
@@ -430,13 +430,13 @@ uvm_pglistalloc_s_ps(struct vm_physseg *
}
KDASSERTMSG(vm_physseg_find(try, &cidx) == ps - vm_physmem,
- ("%s: %s(%#x, &cidx) (%d) != ps - vm_physmem (%zd)",
- __func__, "vm_physseg_find", try,
- vm_physseg_find(try, &cidx), ps - vm_physmem));
+ "%s: %s(%#x, &cidx) (%d) != ps - vm_physmem (%zd)",
+ __func__, "vm_physseg_find", try,
+ vm_physseg_find(try, &cidx), ps - vm_physmem);
KDASSERTMSG(cidx == try - ps->start,
- ("%s: cidx (%#x) != try (%#x) - ps->start (%#"PRIxPADDR")",
- __func__, cidx, try, ps->start));
+ "%s: cidx (%#x) != try (%#x) - ps->start (%#"PRIxPADDR")",
+ __func__, cidx, try, ps->start);
/*
* If this page isn't free, then we need to skip a colors worth
