Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Use uvm_pageboot_alloc() for early memory allocatio...



details:   https://anonhg.NetBSD.org/src/rev/a49fff4d9aab
branches:  trunk
changeset: 508930:a49fff4d9aab
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Apr 22 18:21:48 2001 +0000

description:
Use uvm_pageboot_alloc() for early memory allocation, rather than
calling pmap_steal_memory() directly.  On these platforms, since
uvm_pageboot_alloc() is a wrapper around pmap_steal_memory(), there
is no functional change.  This is merely for API consistency.

diffstat:

 sys/arch/alpha/alpha/machdep.c       |   8 ++++----
 sys/arch/alpha/alpha/pmap.c          |  13 ++++++-------
 sys/arch/arc/arc/machdep.c           |   6 +++---
 sys/arch/arm26/arm26/pmap.c          |   6 +++---
 sys/arch/cobalt/cobalt/machdep.c     |   6 +++---
 sys/arch/hpcmips/hpcmips/machdep.c   |   6 +++---
 sys/arch/mips/mips/pmap.c            |   9 ++++-----
 sys/arch/mipsco/mipsco/machdep.c     |   8 ++++----
 sys/arch/newsmips/newsmips/machdep.c |   8 ++++----
 sys/arch/pmax/pmax/machdep.c         |   6 +++---
 sys/arch/sgimips/sgimips/machdep.c   |   6 +++---
 11 files changed, 40 insertions(+), 42 deletions(-)

diffs (truncated from 361 to 300 lines):

diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c    Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/alpha/alpha/machdep.c    Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.237 2001/04/21 16:27:10 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.238 2001/04/22 18:21:48 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.237 2001/04/21 16:27:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.238 2001/04/22 18:21:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -629,7 +629,7 @@
         * Init mapping for u page(s) for proc 0
         */
        proc0.p_addr = proc0paddr =
-           (struct user *)pmap_steal_memory(UPAGES * PAGE_SIZE, NULL, NULL);
+           (struct user *)uvm_pageboot_alloc(UPAGES * PAGE_SIZE);
 
        /*
         * Allocate space for system data structures.  These data structures
@@ -638,7 +638,7 @@
         * virtual address space.
         */
        size = (vsize_t)allocsys(NULL, NULL);
-       v = (caddr_t)pmap_steal_memory(size, NULL, NULL);
+       v = (caddr_t)uvm_pageboot_alloc(size);
        if ((allocsys(v, NULL) - v) != size)
                panic("alpha_init: table size inconsistency");
 
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/alpha/alpha/pmap.c
--- a/sys/arch/alpha/alpha/pmap.c       Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/alpha/alpha/pmap.c       Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.163 2001/04/22 17:22:57 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.164 2001/04/22 18:21:48 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -154,7 +154,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.163 2001/04/22 17:22:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.164 2001/04/22 18:21:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -846,7 +846,7 @@
         * IF THIS IS NOT A MULTIPLE OF NBPG, ALL WILL GO TO HELL.
         */
        kernel_lev1map = (pt_entry_t *)
-           pmap_steal_memory(sizeof(pt_entry_t) * NPTEPG, NULL, NULL);
+           uvm_pageboot_alloc(sizeof(pt_entry_t) * NPTEPG);
 
        /*
         * Allocate a level 2 PTE table for the kernel.
@@ -855,14 +855,14 @@
         */
        lev2mapsize = roundup(howmany(lev3mapsize, NPTEPG), NPTEPG);
        lev2map = (pt_entry_t *)
-           pmap_steal_memory(sizeof(pt_entry_t) * lev2mapsize, NULL, NULL);
+           uvm_pageboot_alloc(sizeof(pt_entry_t) * lev2mapsize);
 
        /*
         * Allocate a level 3 PTE table for the kernel.
         * Contains lev3mapsize PTEs.
         */
        lev3map = (pt_entry_t *)
-           pmap_steal_memory(sizeof(pt_entry_t) * lev3mapsize, NULL, NULL);
+           uvm_pageboot_alloc(sizeof(pt_entry_t) * lev3mapsize);
 
        /*
         * Allocate memory for the pv_heads.  (A few more of the latter
@@ -875,8 +875,7 @@
         */
        pv_table_npages = physmem;
        pv_table = (struct pv_head *)
-           pmap_steal_memory(sizeof(struct pv_head) * pv_table_npages,
-           NULL, NULL);
+           uvm_pageboot_alloc(sizeof(struct pv_head) * pv_table_npages);
 
        /*
         * ...and intialize the pv_entry list headers.
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/arc/arc/machdep.c
--- a/sys/arch/arc/arc/machdep.c        Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/arc/arc/machdep.c        Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.53 2001/04/12 19:21:20 thorpej Exp $     */
+/*     $NetBSD: machdep.c,v 1.54 2001/04/22 18:21:49 thorpej Exp $     */
 /*     $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $   */
 
 /*
@@ -735,7 +735,7 @@
        /*
         * Allocate space for proc0's USPACE.
         */
-       v = (caddr_t)pmap_steal_memory(USPACE, NULL, NULL); 
+       v = (caddr_t)uvm_pageboot_alloc(USPACE); 
        proc0.p_addr = proc0paddr = (struct user *)v;
        proc0.p_md.md_regs = (struct frame *)(v + USPACE) - 1;
        curpcb = &proc0.p_addr->u_pcb;
@@ -748,7 +748,7 @@
         * virtual address space.
         */
        size = (vsize_t)allocsys(NULL, NULL);
-       v = (caddr_t)pmap_steal_memory(size, NULL, NULL); 
+       v = (caddr_t)uvm_pageboot_alloc(size); 
        if ((allocsys(v, NULL) - v) != size)
                panic("mach_init: table size inconsistency");
 
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/arm26/arm26/pmap.c
--- a/sys/arch/arm26/arm26/pmap.c       Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/arm26/arm26/pmap.c       Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.22 2001/04/22 17:22:57 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.23 2001/04/22 18:21:49 thorpej Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 2000 Ben Harris
  * All rights reserved.
@@ -105,7 +105,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.22 2001/04/22 17:22:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.23 2001/04/22 18:21:49 thorpej Exp $");
 
 #include <sys/kernel.h> /* for cold */
 #include <sys/malloc.h>
@@ -236,7 +236,7 @@
        /* Set up the bootstrap pv_table */
        pv_table_size = round_page(physmem * sizeof(struct pv_entry));
        pv_table =
-           (struct pv_entry *)pmap_steal_memory(pv_table_size, NULL, NULL);
+           (struct pv_entry *)uvm_pageboot_alloc(pv_table_size);
        bzero(pv_table, pv_table_size);
 
        /* Set up the kernel's pmap */
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/cobalt/cobalt/machdep.c
--- a/sys/arch/cobalt/cobalt/machdep.c  Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/cobalt/cobalt/machdep.c  Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.27 2001/03/15 06:10:38 chs Exp $ */
+/*     $NetBSD: machdep.c,v 1.28 2001/04/22 18:21:49 thorpej Exp $     */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -205,7 +205,7 @@
        /*
         * Allocate space for proc0's USPACE.
         */
-       v = (caddr_t)pmap_steal_memory(USPACE, NULL, NULL); 
+       v = (caddr_t)uvm_pageboot_alloc(USPACE); 
        proc0.p_addr = proc0paddr = (struct user *)v;
        proc0.p_md.md_regs = (struct frame *)(v + USPACE) - 1;
        curpcb = &proc0.p_addr->u_pcb;
@@ -218,7 +218,7 @@
         * virtual address space.
         */
        size = (vsize_t)allocsys(NULL, NULL);
-       v = (caddr_t)pmap_steal_memory(size, NULL, NULL); 
+       v = (caddr_t)uvm_pageboot_alloc(size); 
        if ((allocsys(v, NULL) - v) != size)
                panic("mach_init: table size inconsistency");
 
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c        Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c        Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.47 2001/04/18 10:42:39 sato Exp $        */
+/*     $NetBSD: machdep.c,v 1.48 2001/04/22 18:21:49 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -72,7 +72,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2001/04/18 10:42:39 sato Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2001/04/22 18:21:49 thorpej Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 #include "opt_vr41xx.h"
@@ -492,7 +492,7 @@
         * virtual address space.
         */
        size = (unsigned)allocsys(NULL, NULL);
-       v = (caddr_t)pmap_steal_memory(size, NULL, NULL);
+       v = (caddr_t)uvm_pageboot_alloc(size);
        if ((allocsys(v, NULL) - v) != size)
                panic("mach_init: table size inconsistency");
 
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/mips/mips/pmap.c
--- a/sys/arch/mips/mips/pmap.c Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/mips/mips/pmap.c Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.121 2001/04/22 17:22:57 thorpej Exp $       */
+/*     $NetBSD: pmap.c,v 1.122 2001/04/22 18:21:50 thorpej Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.121 2001/04/22 17:22:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.122 2001/04/22 18:21:50 thorpej Exp $");
 
 /*
  *     Manages physical address maps.
@@ -278,7 +278,7 @@
        Sysmapsize += (KSEG2IOBUFSIZE >> PGSHIFT);
 #endif
        Sysmap = (pt_entry_t *)
-           pmap_steal_memory(sizeof(pt_entry_t) * Sysmapsize, NULL, NULL);
+           uvm_pageboot_alloc(sizeof(pt_entry_t) * Sysmapsize);
 
        /*
         * Allocate memory for the pv_heads.  (A few more of the latter
@@ -291,8 +291,7 @@
         */
        pv_table_npages = physmem;
        pv_table = (struct pv_entry *)
-           pmap_steal_memory(sizeof(struct pv_entry) * pv_table_npages,
-               NULL, NULL);
+           uvm_pageboot_alloc(sizeof(struct pv_entry) * pv_table_npages);
 
        /*
         * Initialize `FYI' variables.  Note we're relying on
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/mipsco/mipsco/machdep.c
--- a/sys/arch/mipsco/mipsco/machdep.c  Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/mipsco/mipsco/machdep.c  Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.20 2001/03/30 23:26:29 wdk Exp $ */
+/*     $NetBSD: machdep.c,v 1.21 2001/04/22 18:21:50 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2001/03/30 23:26:29 wdk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2001/04/22 18:21:50 thorpej Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 
@@ -344,7 +344,7 @@
        /*
         * Allocate space for proc0's USPACE.
         */
-       v = (caddr_t)pmap_steal_memory(USPACE, NULL, NULL); 
+       v = (caddr_t)uvm_pageboot_alloc(USPACE); 
        proc0.p_addr = proc0paddr = (struct user *)v;
        proc0.p_md.md_regs = (struct frame *)(v + USPACE) - 1;
        curpcb = &proc0.p_addr->u_pcb;
@@ -357,7 +357,7 @@
         * virtual address space.
         */
        size = (vsize_t)allocsys(NULL, NULL);
-       v = (caddr_t)pmap_steal_memory(size, NULL, NULL); 
+       v = (caddr_t)uvm_pageboot_alloc(size); 
        if ((allocsys(v, NULL) - v) != size)
                panic("mach_init: table size inconsistency");
        /*
diff -r b889ac7c1f7a -r a49fff4d9aab sys/arch/newsmips/newsmips/machdep.c
--- a/sys/arch/newsmips/newsmips/machdep.c      Sun Apr 22 17:37:55 2001 +0000
+++ b/sys/arch/newsmips/newsmips/machdep.c      Sun Apr 22 18:21:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.53 2001/03/15 06:10:45 chs Exp $ */
+/*     $NetBSD: machdep.c,v 1.54 2001/04/22 18:21:50 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2001/03/15 06:10:45 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2001/04/22 18:21:50 thorpej Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 
@@ -321,7 +321,7 @@
        /*
         * Allocate space for proc0's USPACE.
         */
-       v = (caddr_t)pmap_steal_memory(USPACE, NULL, NULL); 
+       v = (caddr_t)uvm_pageboot_alloc(USPACE); 
        proc0.p_addr = proc0paddr = (struct user *)v;
        proc0.p_md.md_regs = (struct frame *)(v + USPACE) - 1;
        curpcb = &proc0.p_addr->u_pcb;
@@ -334,7 +334,7 @@
         * virtual address space.



Home | Main Index | Thread Index | Old Index