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

Fix inconsistencies in various definitions of avail_*, virtual_*, and 

proc0paddr.
This commit is contained in:
matt 2002-12-01 21:20:31 +00:00
parent bd096e500d
commit 4913834e76
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/vax/vax/bus_dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_dma.c,v 1.15 2002/09/25 22:21:29 thorpej Exp $ */
/* $NetBSD: bus_dma.c,v 1.16 2002/12/01 21:20:31 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -62,7 +62,8 @@
#include <machine/ka43.h>
#include <machine/sid.h>
extern vaddr_t avail_start, avail_end, virtual_avail;
extern paddr_t avail_start, avail_end;
extern vaddr_t virtual_avail;
int _bus_dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t, void *,
bus_size_t, struct proc *, int, vaddr_t *, int *, int));

4
sys/arch/vax/vax/locore.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.c,v 1.64 2002/06/04 19:04:32 ragge Exp $ */
/* $NetBSD: locore.c,v 1.65 2002/12/01 21:20:31 matt Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -59,7 +59,7 @@ void main(void);
extern paddr_t avail_end;
paddr_t esym;
u_int proc0paddr;
struct user *proc0paddr;
/*
* The strict cpu-dependent information is set up here, in

6
sys/arch/vax/vax/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.130 2002/11/14 20:30:40 ragge Exp $ */
/* $NetBSD: machdep.c,v 1.131 2002/12/01 21:20:32 matt Exp $ */
/*
* Copyright (c) 2002, Hugh Graham.
@ -95,7 +95,7 @@
#include "smg.h"
extern int virtual_avail, virtual_end;
extern vaddr_t virtual_avail, virtual_end;
/*
* We do these external declarations here, maybe they should be done
* somewhere else...
@ -139,7 +139,7 @@ cpu_startup()
u_int base, residual, i, sz;
vaddr_t minaddr, maxaddr;
vsize_t size;
extern unsigned int avail_end;
extern paddr_t avail_end;
char pbuf[9];
/*

4
sys/arch/vax/vax/mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.24 2002/10/23 09:12:39 jdolecek Exp $ */
/* $NetBSD: mem.c,v 1.25 2002/12/01 21:20:32 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -60,7 +60,7 @@
#define DEV_LEDS 13 /* minor device 13 is leds */
extern unsigned int avail_end;
extern paddr_t avail_end;
static caddr_t zeropage;
dev_type_read(mmrw);

10
sys/arch/vax/vax/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.117 2002/08/25 20:21:44 thorpej Exp $ */
/* $NetBSD: pmap.c,v 1.118 2002/12/01 21:20:32 matt Exp $ */
/*
* Copyright (c) 1994, 1998, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -142,7 +142,7 @@ static struct simplelock pvtable_lock;
int startpmapdebug = 0;
#endif
vaddr_t avail_start, avail_end;
paddr_t avail_start, avail_end;
vaddr_t virtual_avail, virtual_end; /* Available virtual memory */
struct pv_entry *get_pventry(void);
@ -158,7 +158,7 @@ void more_pventries(void);
static vsize_t
calc_kvmsize(vsize_t usrptsize)
{
extern int bufcache;
extern u_int bufcache;
vsize_t kvmsize;
u_int n, s, bp, bc;
@ -222,8 +222,9 @@ calc_kvmsize(vsize_t usrptsize)
void
pmap_bootstrap()
{
extern unsigned int etext;
extern struct user *proc0paddr;
unsigned int sysptsize, i;
extern unsigned int etext, proc0paddr;
struct pcb *pcb = (struct pcb *)proc0paddr;
pmap_t pmap = pmap_kernel();
vsize_t kvmsize, usrptsize;
@ -618,6 +619,7 @@ rmspace(struct pmap *pm)
* Avoid to remove ourselves.
*/
#undef swappable
#define swappable(p, pm) \
(((p)->p_flag & (P_SYSTEM | P_INMEM | P_WEXIT)) == P_INMEM && \
((p)->p_holdcnt == 0) && ((p)->p_vmspace->vm_map.pmap != pm))