Module Name: src Committed By: mhitch Date: Fri Feb 10 06:28:40 UTC 2012
Modified Files: src/sys/arch/cesfic/cesfic: pmap_bootstrap.c src/sys/arch/hp300/hp300: pmap_bootstrap.c src/sys/arch/luna68k/luna68k: pmap_bootstrap.c src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c src/sys/arch/news68k/news68k: pmap_bootstrap.c src/sys/arch/next68k/next68k: pmap_bootstrap.c src/sys/arch/x68k/x68k: pmap_bootstrap.c Log Message: Sigh, it's been too long since I've done some of this. Fix the RELOC(). To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hp300/hp300/pmap_bootstrap.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/news68k/news68k/pmap_bootstrap.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/next68k/next68k/pmap_bootstrap.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x68k/x68k/pmap_bootstrap.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/cesfic/cesfic/pmap_bootstrap.c diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.33 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.34 --- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.33 Fri Feb 10 06:21:15 2012 +++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 06:21:15 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:28:39 mhitch Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 06:21:15 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:28:39 mhitch Exp $"); #include <sys/param.h> #include <uvm/uvm_extern.h> @@ -120,7 +120,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f lkptpa = nextpa; nextpa += PAGE_SIZE; kptpa = nextpa; - nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG); + nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG); nextpa += nptpages * PAGE_SIZE; /* Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.56 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57 --- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.56 Fri Feb 10 06:21:15 2012 +++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.56 2012/02/10 06:21:15 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.56 2012/02/10 06:21:15 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $"); #include <sys/param.h> #include <uvm/uvm_extern.h> @@ -126,7 +126,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f lkptpa = nextpa; nextpa += PAGE_SIZE; kptpa = nextpa; - nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) + + nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) + (IIOMAPSIZE + EIOMAPSIZE + NPTEPG - 1) / NPTEPG; nextpa += nptpages * PAGE_SIZE; Index: src/sys/arch/luna68k/luna68k/pmap_bootstrap.c diff -u src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.34 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.35 --- src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.34 Fri Feb 10 06:21:15 2012 +++ src/sys/arch/luna68k/luna68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:21:15 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.35 2012/02/10 06:28:39 mhitch Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:21:15 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.35 2012/02/10 06:28:39 mhitch Exp $"); #include "opt_m68k_arch.h" @@ -125,7 +125,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f kptmpa = nextpa; nextpa += PAGE_SIZE; kptpa = nextpa; - nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) + + nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) + (iiomapsize + NPTEPG - 1) / NPTEPG; nextpa += nptpages * PAGE_SIZE; Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.50 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.51 --- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.50 Fri Feb 10 06:21:15 2012 +++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.50 2012/02/10 06:21:15 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.51 2012/02/10 06:28:39 mhitch Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.50 2012/02/10 06:21:15 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.51 2012/02/10 06:28:39 mhitch Exp $"); #include "opt_m68k_arch.h" @@ -135,7 +135,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f kptmpa = nextpa; nextpa += PAGE_SIZE; kptpa = nextpa; - nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) + + nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) + (iiomappages + NPTEPG - 1) / NPTEPG; nextpa += nptpages * PAGE_SIZE; Index: src/sys/arch/news68k/news68k/pmap_bootstrap.c diff -u src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.39 src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.40 --- src/sys/arch/news68k/news68k/pmap_bootstrap.c:1.39 Fri Feb 10 06:21:15 2012 +++ src/sys/arch/news68k/news68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.39 2012/02/10 06:21:15 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.40 2012/02/10 06:28:39 mhitch Exp $ */ /* * Copyright (c) 1991, 1993 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.39 2012/02/10 06:21:15 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.40 2012/02/10 06:28:39 mhitch Exp $"); #include "opt_m68k_arch.h" @@ -138,7 +138,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f kptmpa = nextpa; nextpa += PAGE_SIZE; kptpa = nextpa; - nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) + + nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) + (iiomapsize + eiomapsize + NPTEPG - 1) / NPTEPG; nextpa += nptpages * PAGE_SIZE; Index: src/sys/arch/next68k/next68k/pmap_bootstrap.c diff -u src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.41 src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.42 --- src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.41 Fri Feb 10 06:21:15 2012 +++ src/sys/arch/next68k/next68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.41 2012/02/10 06:21:15 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.42 2012/02/10 06:28:39 mhitch Exp $ */ /* * This file was taken from mvme68k/mvme68k/pmap_bootstrap.c @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.41 2012/02/10 06:21:15 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.42 2012/02/10 06:28:39 mhitch Exp $"); #include "opt_m68k_arch.h" @@ -147,7 +147,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f lkptpa = nextpa; nextpa += PAGE_SIZE; kptpa = nextpa; - nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) + + nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) + (IIOMAPSIZE + MONOMAPSIZE + COLORMAPSIZE + NPTEPG - 1) / NPTEPG; nextpa += nptpages * PAGE_SIZE; Index: src/sys/arch/x68k/x68k/pmap_bootstrap.c diff -u src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.57 src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.58 --- src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.57 Fri Feb 10 06:21:15 2012 +++ src/sys/arch/x68k/x68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:21:15 mhitch Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.58 2012/02/10 06:28:39 mhitch Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:21:15 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.58 2012/02/10 06:28:39 mhitch Exp $"); #include "opt_m68k_arch.h" @@ -122,7 +122,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f kptmpa = nextpa; nextpa += PAGE_SIZE; kptpa = nextpa; - nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) + + nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) + (IIOMAPSIZE + NPTEPG - 1) / NPTEPG; nextpa += nptpages * PAGE_SIZE;