Module Name: src
Committed By: bouyer
Date: Wed Oct 10 16:31:55 UTC 2012
Modified Files:
src/sys/uvm [tls-maxphys]: uvm_pager.c
Log Message:
The pagedaemon ca emit write as large as the underlying device's maxphys,
so emergva size needs to be MACHINE_MAXPHYS, MAXPHYS is not enough.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.108.6.1 src/sys/uvm/uvm_pager.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_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.108 src/sys/uvm/uvm_pager.c:1.108.6.1
--- src/sys/uvm/uvm_pager.c:1.108 Fri Jan 27 19:48:42 2012
+++ src/sys/uvm/uvm_pager.c Wed Oct 10 16:31:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.108 2012/01/27 19:48:42 para Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.108.6.1 2012/10/10 16:31:54 bouyer Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.108 2012/01/27 19:48:42 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.108.6.1 2012/10/10 16:31:54 bouyer Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -95,8 +95,8 @@ uvm_pager_realloc_emerg(void)
KASSERT(!emerginuse);
new_emergva = uvm_km_alloc(kernel_map,
- round_page(MAXPHYS) + ptoa(uvmexp.ncolors), ptoa(uvmexp.ncolors),
- UVM_KMF_VAONLY);
+ round_page(MACHINE_MAXPHYS) + ptoa(uvmexp.ncolors),
+ ptoa(uvmexp.ncolors), UVM_KMF_VAONLY);
KASSERT(new_emergva != 0);
@@ -118,7 +118,7 @@ uvm_pager_realloc_emerg(void)
if (old_emergva)
uvm_km_free(kernel_map, old_emergva,
- round_page(MAXPHYS) + ptoa(old_emerg_ncolors),
+ round_page(MACHINE_MAXPHYS) + ptoa(old_emerg_ncolors),
UVM_KMF_VAONLY);
}
@@ -209,7 +209,7 @@ ReStart:
mutex_exit(&pager_map_wanted_lock);
kva = emergva + ptoa(first_color);
/* The shift implicitly truncates to PAGE_SIZE */
- KASSERT(npages <= (MAXPHYS >> PAGE_SHIFT));
+ KASSERT(npages <= (MACHINE_MAXPHYS >> PAGE_SHIFT));
goto enter;
}
if ((flags & UVMPAGER_MAPIN_WAITOK) == 0) {
