diff options
| author | dg <dg@FreeBSD.org> | 1994-10-25 08:58:33 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1994-10-25 08:58:33 +0000 |
| commit | 5eb85325634e77b5601c343fab80020e8bd389c9 (patch) | |
| tree | 056c647f378c32b879c684d7b0cd02e9479854a1 | |
| parent | b10a0127bff14eda67eb5688a753d156fbdbc801 (diff) | |
| download | FreeBSD-src-5eb85325634e77b5601c343fab80020e8bd389c9.zip FreeBSD-src-5eb85325634e77b5601c343fab80020e8bd389c9.tar.gz | |
Allow MAXMEM kernel option to indicate more memory than is detected; it
previously could only be used to limit the amount of memory.
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 7 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index eb5b18c..4db4ca2 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.78 1994/10/20 00:07:49 phk Exp $ + * $Id: machdep.c,v 1.79 1994/10/25 08:34:50 davidg Exp $ */ #include "npx.h" @@ -1312,10 +1312,9 @@ init386(first) #endif /* * Calculate number of physical pages, but account for Maxmem - * limitation above. + * adjustment above. */ - physmem = pagesinbase + - (min(pagesinext + 0x100000/PAGE_SIZE, Maxmem) - 0x100000/PAGE_SIZE); + physmem = pagesinbase + Maxmem - 0x100000/PAGE_SIZE; /* call pmap initialization to make new kernel address space */ pmap_bootstrap (first, 0); diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index eb5b18c..4db4ca2 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.78 1994/10/20 00:07:49 phk Exp $ + * $Id: machdep.c,v 1.79 1994/10/25 08:34:50 davidg Exp $ */ #include "npx.h" @@ -1312,10 +1312,9 @@ init386(first) #endif /* * Calculate number of physical pages, but account for Maxmem - * limitation above. + * adjustment above. */ - physmem = pagesinbase + - (min(pagesinext + 0x100000/PAGE_SIZE, Maxmem) - 0x100000/PAGE_SIZE); + physmem = pagesinbase + Maxmem - 0x100000/PAGE_SIZE; /* call pmap initialization to make new kernel address space */ pmap_bootstrap (first, 0); |
