Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Merge branch with -current; top ...
details: https://anonhg.NetBSD.org/src/rev/0fa2806ced79
branches: sommerfeld_i386mp_1
changeset: 482375:0fa2806ced79
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Fri Mar 16 05:00:46 2001 +0000
description:
Merge branch with -current; top of branch + current builds a working
GENERIC.MP again.
diffstat:
sys/arch/i386/conf/files.i386 | 93 +++++++++++++++++++++--------------------
sys/arch/i386/i386/genassym.cf | 9 +++-
sys/arch/i386/i386/machdep.c | 9 +++-
sys/arch/i386/i386/pmap.c | 13 ++---
sys/arch/i386/i386/trap.c | 20 ++++----
5 files changed, 80 insertions(+), 64 deletions(-)
diffs (truncated from 480 to 300 lines):
diff -r 704b4cfb2710 -r 0fa2806ced79 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Sat Mar 10 19:41:46 2001 +0000
+++ b/sys/arch/i386/conf/files.i386 Fri Mar 16 05:00:46 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.147.2.10 2001/01/23 06:34:54 thorpej Exp $
+# $NetBSD: files.i386,v 1.147.2.11 2001/03/16 05:00:46 sommerfeld Exp $
#
# new style config file for i386 architecture
#
@@ -9,15 +9,16 @@
maxusers 2 16 64
# APM options
-defopt opt_apm.h APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE
- APM_NO_STANDBY APM_V10_ONLY APM_NO_V12 APMDEBUG APMDEBUG_VALUE
- APM_POWER_PRINT APM_DISABLE_INTERRUPTS APM_ALLOW_BOGUS_SEGMENTS
+defopt opt_apm.h APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE
+ APM_NO_STANDBY APM_V10_ONLY APM_NO_V12 APMDEBUG
+ APMDEBUG_VALUE APM_POWER_PRINT APM_DISABLE_INTERRUPTS
+ APM_ALLOW_BOGUS_SEGMENTS
# Processor type options.
-defopt opt_cputype.h I386_CPU I486_CPU I586_CPU I686_CPU
+defopt opt_cputype.h I386_CPU I486_CPU I586_CPU I686_CPU
# delay before cpu_reset() for reboot.
-defopt CPURESET_DELAY
+defopt CPURESET_DELAY
# VM86 emulation
defopt VM86
@@ -35,7 +36,10 @@
defopt PERFCTRS
# X server support in console drivers
-defopt opt_xserver.h XSERVER XSERVER_DDB
+defopt opt_xserver.h XSERVER XSERVER_DDB
+
+# The REAL{BASE,EXT}MEM options
+defopt opt_realmem.h REALBASEMEM REALEXTMEM
# understand boot device passed by pre-1.3 bootblocks
defopt COMPAT_OLDBOOT
@@ -43,7 +47,7 @@
defopt opt_mpbios.h MPVERBOSE MPDEBUG
# PCI BIOS options
-defopt opt_pcibios.h PCIBIOS PCIBIOSVERBOSE
+defopt opt_pcibios.h PCIBIOS PCIBIOSVERBOSE
PCIBIOS_ADDR_FIXUP PCIBIOS_BUS_FIXUP
PCIBIOS_INTR_FIXUP PCIBIOS_INTR_FIXUP_FORCE
PCIBIOS_INTR_GUESS PCIBIOS_IRQS_HINT PCIINTR_DEBUG
@@ -63,7 +67,6 @@
file arch/i386/i386/disksubr.c disk
file arch/i386/i386/gdt.c
file arch/i386/i386/in_cksum.s inet
-file netinet/in4_cksum.c inet
file arch/i386/i386/ipkdb_glue.c ipkdb
file arch/i386/i386/kgdb_machdep.c kgdb
file arch/i386/i386/machdep.c
@@ -91,7 +94,7 @@
# Machine-independent SCSI drivers
#
-include "dev/scsipi/files.scsipi"
+include "dev/scsipi/files.scsipi"
major {sd = 4}
major {cd = 6}
@@ -99,11 +102,11 @@
# Machine-independent ATA drivers
#
-include "dev/ata/files.ata"
+include "dev/ata/files.ata"
major {wd = 0}
# Memory Disk for install floppy
-file arch/i386/i386/md_root.c memory_disk_hooks
+file arch/i386/i386/md_root.c memory_disk_hooks
major {md = 17}
# RAIDframe
@@ -116,11 +119,11 @@
# Machine-independent I2O drivers
#
-include "dev/i2o/files.i2o"
+include "dev/i2o/files.i2o"
# attribute used to bring in BIOS trampoline code for real-mode probing
# of certain devices/BIOS features
-define bioscall
+define bioscall
file arch/i386/i386/bioscall.s bioscall needs-flag
# BIOS32 routines
@@ -131,7 +134,7 @@
# System bus types
#
-define mainbus { [apid = -1] }
+define mainbus { [apid = -1] }
# XXX BIOS32 only if something that uses it is configured!
device mainbus: isabus, eisabus, mcabus, pcibus, mainbus, bios32
attach mainbus at root
@@ -143,7 +146,7 @@
# XXX devices to 'pci'.
#
-include "dev/pci/files.pci"
+include "dev/pci/files.pci"
file arch/i386/pci/pci_machdep.c pci
file arch/i386/pci/pcibios.c pcibios
file arch/i386/pci/pci_intr_fixup.c pcibios & pcibios_intr_fixup
@@ -154,7 +157,7 @@
file arch/i386/pci/via82c586.c pcibios & pcibios_intr_fixup
file arch/i386/pci/pci_bus_fixup.c pcibios & pcibios_bus_fixup
file arch/i386/pci/pci_addr_fixup.c pcibios & pcibios_addr_fixup
-defopt PCI_CONF_MODE
+defopt PCI_CONF_MODE
file arch/i386/pci/pciide_machdep.c pciide
file arch/i386/pci/pcic_pci_machdep.c pcic_pci
@@ -179,14 +182,14 @@
file arch/i386/isa/joy.c joy needs-flag
# PCI joysticks
-attach joy at pci with pci_joy
+attach joy at pci with pci_joy
file arch/i386/pci/joy_pci.c pci_joy
#
# ISA and mixed ISA+EISA or ISA+PCI drivers
#
-include "dev/isa/files.isa"
+include "dev/isa/files.isa"
major {mcd = 7}
#major {scd = 15}
@@ -213,7 +216,7 @@
# attribute used to represent the "keyboard controller"
# XXX should be a real device
-define pckbcport { [irq = -1], [port = -1] }
+define pckbcport { [irq = -1], [port = -1] }
# PC console support a la "pccons"
device pc: tty, pckbcport
@@ -240,12 +243,12 @@
attach opms at pckbc with opms_pckbc
file arch/i386/isa/pms.c opms | opms_hack | opms_pckbc needs-flag
-include "dev/wscons/files.wscons"
+include "dev/wscons/files.wscons"
-include "dev/pckbc/files.pckbc"
+include "dev/pckbc/files.pckbc"
-device sysbeep
-attach sysbeep at pcppi
+device sysbeep
+attach sysbeep at pcppi
# Floppy disk controller
device fdc {drive = -1}: isadma
@@ -270,15 +273,15 @@
# EISA-only drivers
#
-include "dev/eisa/files.eisa"
+include "dev/eisa/files.eisa"
file arch/i386/eisa/eisa_machdep.c eisa
#
# MCA-only drivers
#
-device mca {[slot = -1]} : bioscall
-include "dev/mca/files.mca"
+device mca {[slot = -1]} : bioscall
+include "dev/mca/files.mca"
file arch/i386/mca/mca_machdep.c mca
# ISA Plug 'n Play devices
@@ -290,15 +293,15 @@
#
# VME support
#
-include "dev/vme/files.vme"
+include "dev/vme/files.vme"
#
# Other mainbus-attached devices
#
# Advanced Power Management support (APM)
-device apm: bioscall
-attach apm at mainbus
+device apm: bioscall
+attach apm at mainbus
file arch/i386/i386/apm.c apm needs-count
file arch/i386/i386/apmcall.s apm
@@ -336,45 +339,45 @@
file arch/i386/i386/compat_13_machdep.c compat_13 | compat_aout
# SVR4 binary compatibility (COMPAT_SVR4)
-include "compat/svr4/files.svr4"
+include "compat/svr4/files.svr4"
file arch/i386/i386/svr4_machdep.c compat_svr4
file arch/i386/i386/svr4_sigcode.s compat_svr4
file arch/i386/i386/svr4_syscall.c compat_svr4
# iBCS-2 binary compatibility (COMPAT_IBCS2)
-include "compat/ibcs2/files.ibcs2"
+include "compat/ibcs2/files.ibcs2"
file arch/i386/i386/ibcs2_machdep.c compat_ibcs2
file arch/i386/i386/ibcs2_sigcode.s compat_ibcs2
file arch/i386/i386/ibcs2_syscall.c compat_ibcs2
# Linux binary compatibility (COMPAT_LINUX)
-include "compat/linux/files.linux"
-include "compat/linux/arch/i386/files.linux_i386"
+include "compat/linux/files.linux"
+include "compat/linux/arch/i386/files.linux_i386"
file arch/i386/i386/linux_sigcode.s compat_linux
file arch/i386/i386/linux_syscall.c compat_linux
# FreeBSD binary compatibility (COMPAT_FREEBSD)
-include "compat/freebsd/files.freebsd"
+include "compat/freebsd/files.freebsd"
file arch/i386/i386/freebsd_machdep.c compat_freebsd
file arch/i386/i386/freebsd_sigcode.s compat_freebsd
file arch/i386/i386/freebsd_syscall.c compat_freebsd
# a.out binary compatibility (COMPAT_AOUT)
-include "compat/aout/files.aout"
+include "compat/aout/files.aout"
# Win32 binary compatibility (COMPAT_PECOFF)
-include "compat/pecoff/files.pecoff"
+include "compat/pecoff/files.pecoff"
# OSS audio driver compatibility
-include "compat/ossaudio/files.ossaudio"
+include "compat/ossaudio/files.ossaudio"
# network devices MII bus
-include "dev/mii/files.mii"
+include "dev/mii/files.mii"
#
# CARDBUS
#
-include "dev/cardbus/files.cardbus"
+include "dev/cardbus/files.cardbus"
file arch/i386/i386/rbus_machdep.c cardbus
# XXXX pcic here because it needs to be late. The catch: pcic needs
@@ -402,7 +405,7 @@
file dev/pci/i82365_pci.c pcic_pci
# PCIC pcmcia controller on PnP board
-attach pcic at isapnp with pcic_isapnp
+attach pcic at isapnp with pcic_isapnp
file dev/isapnp/i82365_isapnp.c pcic_isapnp
# Code common to ISA and ISAPnP attachments
@@ -432,11 +435,11 @@
#
# Machine-independent PCMCIA drivers
#
-include "dev/pcmcia/files.pcmcia"
+include "dev/pcmcia/files.pcmcia"
-include "dev/usb/files.usb"
+include "dev/usb/files.usb"
-include "dev/ieee1394/files.ieee1394"
+include "dev/ieee1394/files.ieee1394"
-include "arch/i386/pnpbios/files.pnpbios"
+include "arch/i386/pnpbios/files.pnpbios"
diff -r 704b4cfb2710 -r 0fa2806ced79 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf Sat Mar 10 19:41:46 2001 +0000
+++ b/sys/arch/i386/i386/genassym.cf Fri Mar 16 05:00:46 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.17.10.9 2001/01/10 04:38:32 sommerfeld Exp $
+# $NetBSD: genassym.cf,v 1.17.10.10 2001/03/16 05:00:47 sommerfeld Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -87,6 +87,10 @@
include <sys/device.h>
include <sys/user.h>
include <sys/mbuf.h>
+include <netinet/in.h>
Home |
Main Index |
Thread Index |
Old Index