diff options
| author | nyan <nyan@FreeBSD.org> | 2000-04-30 08:52:47 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2000-04-30 08:52:47 +0000 |
| commit | c9fb25da0a1646f486b6d42bc85b5e21d742ce8a (patch) | |
| tree | 751205b54381e430ed3edf5cf90c92fbcec3027e /sys | |
| parent | 31accf5f5a4dc2b7b0cc7944792034c2dc43f355 (diff) | |
| download | FreeBSD-src-c9fb25da0a1646f486b6d42bc85b5e21d742ce8a.zip FreeBSD-src-c9fb25da0a1646f486b6d42bc85b5e21d742ce8a.tar.gz | |
Clean up MAXMEM routine.
Submitted by: "K.Magara" <magara@maizuru-ct.ac.jp>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 6 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 27c8f27..06b94c4 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -1442,6 +1442,7 @@ getmemsize(int first) Maxmem_under16M = under16 * 1024 / PAGE_SIZE; +#ifndef MAXMEM /* * Maxmem isn't the "maximum memory", it's one larger than the * highest page of the physical address space. It should be @@ -1460,8 +1461,7 @@ getmemsize(int first) speculative_mprobe = TRUE; else speculative_mprobe = FALSE; - -#ifdef MAXMEM +#else Maxmem = MAXMEM/4; speculative_mprobe = FALSE; #endif @@ -1774,7 +1774,6 @@ getmemsize(int first) pte = (pt_entry_t)vtopte(KERNBASE + (1 << PAGE_SHIFT)); *pte = (1 << PAGE_SHIFT) | PG_RW | PG_V; - extmem = (Maxmem * PAGE_SIZE - 0x100000)/1024; /* extent memory */ /* * get memory map with INT 15:E820 */ @@ -2266,6 +2265,7 @@ init386(first) vm86_initialize(); getmemsize(first); + /* now running on new page tables, configured,and u/iom is accessible */ /* Map the message buffer. */ diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 27c8f27..06b94c4 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -1442,6 +1442,7 @@ getmemsize(int first) Maxmem_under16M = under16 * 1024 / PAGE_SIZE; +#ifndef MAXMEM /* * Maxmem isn't the "maximum memory", it's one larger than the * highest page of the physical address space. It should be @@ -1460,8 +1461,7 @@ getmemsize(int first) speculative_mprobe = TRUE; else speculative_mprobe = FALSE; - -#ifdef MAXMEM +#else Maxmem = MAXMEM/4; speculative_mprobe = FALSE; #endif @@ -1774,7 +1774,6 @@ getmemsize(int first) pte = (pt_entry_t)vtopte(KERNBASE + (1 << PAGE_SHIFT)); *pte = (1 << PAGE_SHIFT) | PG_RW | PG_V; - extmem = (Maxmem * PAGE_SIZE - 0x100000)/1024; /* extent memory */ /* * get memory map with INT 15:E820 */ @@ -2266,6 +2265,7 @@ init386(first) vm86_initialize(); getmemsize(first); + /* now running on new page tables, configured,and u/iom is accessible */ /* Map the message buffer. */ |
