summaryrefslogtreecommitdiff
path: root/sys/pc98
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@FreeBSD.org>2011-03-15 08:20:59 +0000
committerSergey Kandaurov <pluknet@FreeBSD.org>2011-03-15 08:20:59 +0000
commitd8904dec4ff382dcfbcb242bedce67339e3c999c (patch)
tree00edcce73d9cd68bb6d2ca8fb6e7b3ea571dff1c /sys/pc98
parent83ef6d01eaedfa8fb0aeb2744f4c23ffe4f7f89a (diff)
MFC kern.msgbufsize: r217688-217689,r217709,r218666-218667,r218913.
Note, that arm/{s3c2xx0,econa} exist only in head, thus not merged. r217688: Make MSGBUF_SIZE kernel option a loader tunable kern.msgbufsize. r217689: Add kern.msgbufsize default setting to /boot/defaults/loader.conf. r217709,218666-218667,218913 by marcel, cognet: Fix up for various arm subtargets: call init_param1() before we use msgbufsize, now that the size of the message buffer is a tunable. Reviewed by: marcel Approved by: avg (mentor)
Notes
svn path=/stable/8/; revision=219662
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/pc98/machdep.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 8cac8b17dc3f..524737eb7326 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include "opt_isa.h"
#include "opt_kstack_pages.h"
#include "opt_maxmem.h"
-#include "opt_msgbuf.h"
#include "opt_npx.h"
#include "opt_perfmon.h"
@@ -2055,7 +2054,7 @@ do_next:
* calculation, etc.).
*/
while (phys_avail[pa_indx - 1] + PAGE_SIZE +
- round_page(MSGBUF_SIZE) >= phys_avail[pa_indx]) {
+ round_page(msgbufsize) >= phys_avail[pa_indx]) {
physmem -= atop(phys_avail[pa_indx] - phys_avail[pa_indx - 1]);
phys_avail[pa_indx--] = 0;
phys_avail[pa_indx--] = 0;
@@ -2064,10 +2063,10 @@ do_next:
Maxmem = atop(phys_avail[pa_indx]);
/* Trim off space for the message buffer. */
- phys_avail[pa_indx] -= round_page(MSGBUF_SIZE);
+ phys_avail[pa_indx] -= round_page(msgbufsize);
/* Map the message buffer. */
- for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE)
+ for (off = 0; off < round_page(msgbufsize); off += PAGE_SIZE)
pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] +
off);
}
@@ -2282,7 +2281,7 @@ init386(first)
/* now running on new page tables, configured,and u/iom is accessible */
- msgbufinit(msgbufp, MSGBUF_SIZE);
+ msgbufinit(msgbufp, msgbufsize);
/* make a call gate to reenter kernel with */
gdp = &ldt[LSYS5CALLS_SEL].gd;