Module Name: src
Committed By: cherry
Date: Sat Dec 24 18:34:31 UTC 2016
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c
src/sys/arch/powerpc/include/booke: pmap.h
Log Message:
Tell mpc85xx about uvm_hotplug(9)
Should fix the evbppc build breakage.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/booke/pmap.h
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/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.24 src/sys/arch/powerpc/booke/booke_pmap.c:1.25
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.24 Mon Jul 11 16:06:52 2016
+++ src/sys/arch/powerpc/booke/booke_pmap.c Sat Dec 24 18:34:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.24 2016/07/11 16:06:52 matt Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.25 2016/12/24 18:34:31 cherry Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.24 2016/07/11 16:06:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.25 2016/12/24 18:34:31 cherry Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
@@ -190,8 +190,8 @@ pmap_bootstrap(vaddr_t startkernel, vadd
* for us. Must do this before uvm_pageboot_alloc()
* can be called.
*/
- pmap_limits.avail_start = vm_physmem[0].start << PGSHIFT;
- pmap_limits.avail_end = vm_physmem[vm_nphysseg - 1].end << PGSHIFT;
+ pmap_limits.avail_start = uvm_physseg_get_start(uvm_physseg_get_first()) << PGSHIFT;
+ pmap_limits.avail_end = uvm_physseg_get_end(uvm_physseg_get_last()) << PGSHIFT;
const size_t max_nsegtabs =
(pmap_round_seg(VM_MAX_KERNEL_ADDRESS)
- pmap_trunc_seg(VM_MIN_KERNEL_ADDRESS)) / NBSEG;
Index: src/sys/arch/powerpc/include/booke/pmap.h
diff -u src/sys/arch/powerpc/include/booke/pmap.h:1.16 src/sys/arch/powerpc/include/booke/pmap.h:1.17
--- src/sys/arch/powerpc/include/booke/pmap.h:1.16 Mon Jul 11 16:06:52 2016
+++ src/sys/arch/powerpc/include/booke/pmap.h Sat Dec 24 18:34:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.16 2016/07/11 16:06:52 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.17 2016/12/24 18:34:31 cherry Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -51,6 +51,7 @@
#include <sys/cpu.h>
#include <sys/kcore.h>
#include <uvm/uvm_page.h>
+#include <uvm/uvm_physseg.h>
#ifdef __PMAP_PRIVATE
#include <powerpc/booke/cpuvar.h>
#endif
@@ -151,7 +152,7 @@ pmap_md_tlb_asid_max(void)
struct vm_physseg;
static inline bool
-pmap_md_ok_to_steal_p(const struct vm_physseg *seg, size_t npgs)
+pmap_md_ok_to_steal_p(const uvm_physseg_t bank, size_t npgs)
{
return true;
}
