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

Synchronize some more bits.

This commit is contained in:
mycroft 1994-01-11 17:51:40 +00:00
parent e12a200e8a
commit 10865c97fa
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/i386/i386/machdep.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* machdep.c,v 1.47 1993/09/05 03:54:11 sef Exp
* $Id: machdep.c,v 1.73 1994/01/11 17:51:40 mycroft Exp $
*/
#include <stddef.h>
@ -69,8 +69,6 @@
#include <sys/shm.h>
#endif
#include <net/netisr.h>
#include <vm/vm.h>
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
@ -217,7 +215,7 @@ cpu_startup()
M_MBUF, M_NOWAIT);
bzero(mclrefcnt, NMBCLUSTERS+CLBYTES/MCLBYTES);
mb_map = kmem_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
VM_MBUF_SIZE, FALSE);
VM_MBUF_SIZE, FALSE);
/*
* Initialize callouts
@ -510,7 +508,7 @@ sigreturn(p, uap, retval)
*/
scp = uap->sigcntxp;
fp = (struct sigframe *)
((caddr_t)scp - offsetof(struct sigframe, sf_sc));
((caddr_t)scp - offsetof(struct sigframe, sf_sc));
if (useracc((caddr_t)fp, sizeof(*fp), 0) == 0)
return(EFAULT);
@ -936,7 +934,7 @@ init386(first_avail)
setidt(0, &IDTVEC(div), SDT_SYS386TGT, SEL_KPL);
setidt(1, &IDTVEC(dbg), SDT_SYS386TGT, SEL_KPL);
setidt(2, &IDTVEC(nmi), SDT_SYS386TGT, SEL_KPL);
setidt(3, &IDTVEC(bpt), SDT_SYS386TGT, SEL_UPL); /* XXXX */
setidt(3, &IDTVEC(bpt), SDT_SYS386TGT, SEL_UPL); /* XXXX */
setidt(4, &IDTVEC(ofl), SDT_SYS386TGT, SEL_KPL);
setidt(5, &IDTVEC(bnd), SDT_SYS386TGT, SEL_KPL);
setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL);
@ -993,10 +991,8 @@ init386(first_avail)
* Use BIOS values stored in RTC CMOS RAM, since probing
* breaks certain 386 AT relics.
*/
biosbasemem = (rtcin(RTC_BASEHI)<<8) |
(rtcin(RTC_BASELO));
biosextmem = (rtcin(RTC_EXTHI)<<8) |
(rtcin(RTC_EXTLO));
biosbasemem = (rtcin(RTC_BASEHI)<<8) | (rtcin(RTC_BASELO));
biosextmem = (rtcin(RTC_EXTHI)<<8) | (rtcin(RTC_EXTLO));
#ifndef BIOS_BASEMEM
#define BIOS_BASEMEM 640
@ -1004,14 +1000,14 @@ init386(first_avail)
if (biosbasemem == 0 || biosbasemem > 640) {
printf("warning: nvram reports %dk base memory; assuming %dk\n",
biosbasemem, BIOS_BASEMEM);
biosbasemem, BIOS_BASEMEM);
biosbasemem = BIOS_BASEMEM;
}
avail_start = NBPG; /* BIOS leaves data in low memory */
/* and VM system doesn't work with phys 0 */
avail_end = biosextmem ? IOM_END + biosextmem * 1024
: biosbasemem * 1024;
: biosbasemem * 1024;
/* number of pages of physmem addr space */
physmem = btoc((biosbasemem + biosextmem) * 1024);
@ -1029,7 +1025,7 @@ init386(first_avail)
if (avail_remaining < i386_btop(2 * 1024 * 1024)) {
printf("warning: too little memory available; running in degraded mode\n"
"press a key to confirm\n\n");
"press a key to confirm\n\n");
/*
* People with less than 2 Meg have to press a key; this way
* we see the messages and can tell them why they blow up later.