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

MACHINE_NONCONTIG -> EXTENDED_MEMORY.

Browse Source
This commit is contained in:
minoura 1999-03-17 12:29:56 +00:00
parent a6cf3ee3f8
commit 6de1aeaee6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/x68k/x68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.49 1999/03/16 16:30:23 minoura Exp $ */
/* $NetBSD: machdep.c,v 1.50 1999/03/17 12:30:31 minoura Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -138,7 +138,7 @@ vm_map_t buffer_map;
extern paddr_t avail_start;
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
extern int numranges;
extern u_long low[8];
extern u_long high[8];
@ -236,7 +236,7 @@ consinit()
* Tell the VM system about available physical memory.
*/
#if defined(UVM)
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
for (i = 0; i < numranges; i++) {
paddr_t startmem = i == 0 ? avail_start : low[i];
@ -250,7 +250,7 @@ consinit()
VM_FREELIST_DEFAULT);
#endif
#else /* not UVM */
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
for (i = 0; i < numranges; i++) {
paddr_t startmem = i == 0 ? avail_start : low[i];
@ -291,7 +291,7 @@ cpu_startup()
* avail_end was pre-decremented in pmap_bootstrap to compensate.
*/
for (i = 0; i < btoc(MSGBUFSIZE); i++)
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
pmap_enter(pmap_kernel(), (vaddr_t)msgbufaddr + i * NBPG,
high[numranges - 1] + i * NBPG, VM_PROT_ALL, TRUE);
#else
@ -838,7 +838,7 @@ reserve_dumppages(p)
return (p + BYTES_PER_DUMP);
}
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
static int find_range __P((paddr_t));
static int find_next_range __P((paddr_t));
@ -920,7 +920,7 @@ dumpsys()
blkno = dumplo;
dump = bdevsw[major(dumpdev)].d_dump;
for (i = 0; i < bytes; i += n) {
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
/*
* Avoid dumping "holes."
*/

10
sys/arch/x68k/x68k/pmap_bootstrap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap_bootstrap.c,v 1.15 1999/03/16 16:30:23 minoura Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.16 1999/03/17 12:29:56 minoura Exp $ */
/*
* Copyright (c) 1991, 1993
@ -69,7 +69,7 @@ u_int8_t *intiobase = (u_int8_t *) PHYS_IODEV;
void pmap_bootstrap __P((paddr_t, paddr_t));
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
static int mem_exists __P((caddr_t, u_long));
static void setmemrange __P((paddr_t));
@ -163,7 +163,7 @@ pmap_bootstrap(nextpa, firstpa)
nextpa += NBPG;
p0upa = nextpa;
nextpa += USPACE;
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
setmemrange(firstpa);
#if 0
if (nextpa > high[0]) {
@ -451,7 +451,7 @@ pmap_bootstrap(nextpa, firstpa)
m68k_ptob(RELOC(maxmem, int))
/* XXX allow for msgbuf */
- m68k_round_page(MSGBUFSIZE);
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
{
int i;
psize_t av_rem = 0;
@ -571,7 +571,7 @@ pmap_bootstrap(nextpa, firstpa)
}
}
#ifdef MACHINE_NONCONTIG
#ifdef EXTENDED_MEMORY
static struct memlist {
caddr_t base;
psize_t min;