Module Name: src
Committed By: scole
Date: Fri Dec 23 17:26:43 UTC 2016
Modified Files:
src/sys/arch/ia64/ia64: pmap.c
Log Message:
make kernel compilable after recent uvm changes
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/ia64/ia64/pmap.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/ia64/ia64/pmap.c
diff -u src/sys/arch/ia64/ia64/pmap.c:1.33 src/sys/arch/ia64/ia64/pmap.c:1.34
--- src/sys/arch/ia64/ia64/pmap.c:1.33 Fri Dec 23 07:15:27 2016
+++ src/sys/arch/ia64/ia64/pmap.c Fri Dec 23 17:26:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.33 2016/12/23 07:15:27 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.34 2016/12/23 17:26:43 scole Exp $ */
/*-
@@ -85,7 +85,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33 2016/12/23 07:15:27 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.34 2016/12/23 17:26:43 scole Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -342,7 +342,7 @@ pmap_steal_memory(vsize_t size, vaddr_t
/*
* There are enough pages here; steal them!
*/
- pa = ptoa(uvm_physseg_get_start(bank));
+ pa = ptoa(uvm_physseg_get_start(upm));
uvm_physseg_unplug(atop(pa), npgs);
va = IA64_PHYS_TO_RR7(pa);
@@ -370,7 +370,7 @@ pmap_steal_vhpt_memory(vsize_t size)
int npgs;
uvm_physseg_t upm;
vaddr_t va;
- paddr_t tmppa, pa = 0;
+ paddr_t pa = 0;
paddr_t vhpt_start = 0, start1, start2, end1, end2;
size = round_page(size);
