Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bogus DEBUG uvm_map() calls - (sync with amiga pmap). From Tuomo

This commit is contained in:
abs 2008-11-15 21:30:50 +00:00
parent 85609809d6
commit 58051692c8
3 changed files with 11 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/atari/atari/atari_init.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atari_init.c,v 1.67 2007/03/04 05:59:39 christos Exp $ */
/* $NetBSD: atari_init.c,v 1.68 2008/11/15 21:30:50 abs Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.67 2007/03/04 05:59:39 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.68 2008/11/15 21:30:50 abs Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@ -494,7 +494,7 @@ char *esym_addr; /* Address of kernel '_esym' symbol */
/*
* get the pmap module in sync with reality.
*/
pmap_bootstrap(vstart, stio_addr, ptextra);
pmap_bootstrap(vstart, stio_addr);
/*
* Prepare to enable the MMU.

43
sys/arch/atari/atari/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.105 2008/06/29 09:04:19 tsutsui Exp $ */
/* $NetBSD: pmap.c,v 1.106 2008/11/15 21:30:50 abs Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.105 2008/06/29 09:04:19 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.106 2008/11/15 21:30:50 abs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -343,7 +343,6 @@ pa_to_attribute(paddr_t pa)
* values are passed to pmap_bootstrap().
*/
static u_int atarihwaddr;
static u_int atarihwpg;
/*
* Bootstrap the system enough to run with virtual memory.
@ -357,9 +356,9 @@ static u_int atarihwpg;
* address of 0xFFxxxxxx.]
*/
void
pmap_bootstrap(kernel_size, hw_addr, hw_pages)
pmap_bootstrap(kernel_size, hw_addr)
psize_t kernel_size;
u_int hw_addr, hw_pages;
u_int hw_addr;
{
vaddr_t va;
u_int *pte;
@ -368,8 +367,8 @@ u_int hw_addr, hw_pages;
/*
* Record start & size of I/O area for use by pmap_init()
*/
atarihwaddr = hw_addr;
atarihwpg = hw_pages;
/*
* Announce page-size to the VM-system
@ -464,38 +463,8 @@ pmap_init()
#endif
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
if (pmapdebug & PDB_FOLLOW) {
printf("pmap_init()\n");
#endif
/*
* Now that kernel map has been allocated, we can mark as
* unavailable regions which we have mapped in atari_init.c.
*/
addr = atarihwaddr;
if (uvm_map(kernel_map, &addr,
ptoa(atarihwpg),
NULL, UVM_UNKNOWN_OFFSET, 0,
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE,
UVM_INH_NONE, UVM_ADV_RANDOM,
UVM_FLAG_FIXED)) != 0)
goto bogons;
addr = (vaddr_t) Sysmap;
if (uvm_map(kernel_map, &addr, ATARI_KPTSIZE,
NULL, UVM_UNKNOWN_OFFSET, 0,
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE,
UVM_INH_NONE, UVM_ADV_RANDOM,
UVM_FLAG_FIXED)) != 0) {
/*
* If this fails, it is probably because the static
* portion of the kernel page table isn't big enough
* and we overran the page table map.
*/
bogons:
panic("pmap_init: bogons in the VM system!");
}
#ifdef DEBUG
if (pmapdebug & PDB_INIT) {
printf("pmap_init: Sysseg %p, Sysmap %p, Sysptmap %p\n",
Sysseg, Sysmap, Sysptmap);
printf(" vstart %lx, vend %lx\n", virtual_avail, virtual_end);

4
sys/arch/atari/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.36 2008/01/11 14:03:47 he Exp $ */
/* $NetBSD: pmap.h,v 1.37 2008/11/15 21:30:50 abs Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@ -200,7 +200,7 @@ pmap_remove_all(struct pmap *pmap)
(curproc && \
(pm) != pmap_kernel() && (pm) == curproc->p_vmspace->vm_map.pmap)
void pmap_bootstrap __P((psize_t, u_int, u_int));
void pmap_bootstrap __P((psize_t, u_int));
void pmap_changebit __P((paddr_t, int, bool));
vaddr_t pmap_map __P((vaddr_t, paddr_t, paddr_t, int));