[src/trunk]: src/sys/arch Sigh, it's been too long since I've done some of th...

[mhitch <mhitch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/18a488b2ecf4
branches:  trunk
changeset: 773626:18a488b2ecf4
user:      mhitch <mhitch%NetBSD.org@localhost>
date:      Fri Feb 10 06:28:39 2012 +0000

description:
Sigh, it's been too long since I've done some of this.  Fix the RELOC().

diffstat:

 sys/arch/cesfic/cesfic/pmap_bootstrap.c   |  6 +++---
 sys/arch/hp300/hp300/pmap_bootstrap.c     |  6 +++---
 sys/arch/luna68k/luna68k/pmap_bootstrap.c |  6 +++---
 sys/arch/mvme68k/mvme68k/pmap_bootstrap.c |  6 +++---
 sys/arch/news68k/news68k/pmap_bootstrap.c |  6 +++---
 sys/arch/next68k/next68k/pmap_bootstrap.c |  6 +++---
 sys/arch/x68k/x68k/pmap_bootstrap.c       |  6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diffs (189 lines):

diff -r 6664c5676aff -r 18a488b2ecf4 sys/arch/cesfic/cesfic/pmap_bootstrap.c
--- a/sys/arch/cesfic/cesfic/pmap_bootstrap.c   Fri Feb 10 06:21:15 2012 +0000
+++ b/sys/arch/cesfic/cesfic/pmap_bootstrap.c   Fri Feb 10 06:28:39 2012 +0000
@@ -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 @@
        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;
 
        /*
diff -r 6664c5676aff -r 18a488b2ecf4 sys/arch/hp300/hp300/pmap_bootstrap.c
--- a/sys/arch/hp300/hp300/pmap_bootstrap.c     Fri Feb 10 06:21:15 2012 +0000
+++ b/sys/arch/hp300/hp300/pmap_bootstrap.c     Fri Feb 10 06:28:39 2012 +0000
@@ -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 @@
        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;
 
diff -r 6664c5676aff -r 18a488b2ecf4 sys/arch/luna68k/luna68k/pmap_bootstrap.c
--- a/sys/arch/luna68k/luna68k/pmap_bootstrap.c Fri Feb 10 06:21:15 2012 +0000
+++ b/sys/arch/luna68k/luna68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 +0000
@@ -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 @@
        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;
 
diff -r 6664c5676aff -r 18a488b2ecf4 sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
--- a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Fri Feb 10 06:21:15 2012 +0000
+++ b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 +0000
@@ -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 @@
        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;
 
diff -r 6664c5676aff -r 18a488b2ecf4 sys/arch/news68k/news68k/pmap_bootstrap.c
--- a/sys/arch/news68k/news68k/pmap_bootstrap.c Fri Feb 10 06:21:15 2012 +0000
+++ b/sys/arch/news68k/news68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 +0000
@@ -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 @@
        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;
 
diff -r 6664c5676aff -r 18a488b2ecf4 sys/arch/next68k/next68k/pmap_bootstrap.c
--- a/sys/arch/next68k/next68k/pmap_bootstrap.c Fri Feb 10 06:21:15 2012 +0000
+++ b/sys/arch/next68k/next68k/pmap_bootstrap.c Fri Feb 10 06:28:39 2012 +0000
@@ -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 @@
        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;
 
diff -r 6664c5676aff -r 18a488b2ecf4 sys/arch/x68k/x68k/pmap_bootstrap.c
--- a/sys/arch/x68k/x68k/pmap_bootstrap.c       Fri Feb 10 06:21:15 2012 +0000
+++ b/sys/arch/x68k/x68k/pmap_bootstrap.c       Fri Feb 10 06:28:39 2012 +0000
@@ -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 @@
        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;