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 sommerfeld_i386mp_1 branch...
details: https://anonhg.NetBSD.org/src/rev/f3639486f135
branches: sommerfeld_i386mp_1
changeset: 482243:f3639486f135
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Mon Aug 07 01:08:27 2000 +0000
description:
Merge sommerfeld_i386mp_1 branch forward to 20000806 sources
diffstat:
sys/arch/i386/conf/GENERIC | 29 ++++++++++++++++++++---------
sys/arch/i386/conf/INSTALL | 4 ++--
sys/arch/i386/i386/bus_machdep.c | 11 ++++++-----
sys/arch/i386/i386/cpu.c | 6 +-----
sys/arch/i386/i386/genassym.cf | 5 +----
sys/arch/i386/i386/ioapic.c | 6 +-----
sys/arch/i386/i386/ipifuncs.c | 4 ++--
sys/arch/i386/i386/lapic.c | 6 +-----
sys/arch/i386/i386/machdep.c | 8 +++-----
sys/arch/i386/i386/mpbios.c | 9 +++------
sys/arch/i386/i386/pmap.c | 6 +-----
sys/arch/i386/i386/process_machdep.c | 4 ++--
sys/arch/i386/i386/trap.c | 4 +---
sys/arch/i386/i386/vm_machdep.c | 5 +----
sys/arch/i386/include/param.h | 4 ++--
sys/arch/i386/isa/icu.s | 11 ++---------
sys/arch/i386/isa/isa_machdep.c | 4 ++--
sys/arch/i386/isa/npx.c | 4 +---
sys/arch/i386/pci/pci_machdep.c | 9 ++++-----
19 files changed, 56 insertions(+), 83 deletions(-)
diffs (truncated from 564 to 300 lines):
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC Mon Aug 07 01:08:27 2000 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.300.2.6 2000/06/25 19:36:55 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.7 2000/08/07 01:08:27 sommerfeld Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.6 $"
+#ident "GENERIC-$Revision: 1.300.2.7 $"
maxusers 32 # estimated number of users
@@ -62,7 +62,7 @@
#options DEBUG # expensive debugging checks/support
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
-#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options "KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -82,8 +82,7 @@
options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
-
-options COMPAT_AOUT # binary compat for NetBSD a.out binaries
+#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
file-system FFS # UFS
@@ -116,6 +115,7 @@
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
+options PULLDOWN_TEST # use m_pulldown for IPv4/v6 processing
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -123,7 +123,7 @@
options NS # XNS
#options NSIP # XNS tunneling over IP
options ISO,TPIP # OSI
-options EON # OSI tunneling over IP
+#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
options PPP_BSDCOMP # BSD-Compress compression support for PPP
@@ -146,6 +146,7 @@
options USBVERBOSE # verbose USB device autoconfig messages
#options PNPBIOSVERBOSE # verbose PnP BIOS messages
#options PNPBIOSDEBUG # more fullsome Pnp BIOS debugging messages
+
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
#
@@ -220,7 +221,7 @@
#fdc* at pnpbios? index ? # floppy controller
# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
-#pciide* at pnpbios? index ?
+#pciide* at pnpbios? index ?
# PCI bus support
pci* at mainbus? bus ?
@@ -231,7 +232,7 @@
#options PCIBIOS # PCI BIOS support
#options PCIBIOSVERBOSE # PCI BIOS verbose info
#options PCIBIOS_INTR_FIXUP # fixup PCI interrupt routing
-#options PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
+#options PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
#options PCIBIOS_BUS_FIXUP # fixup PCI bus numbering
#options PCIBIOS_ADDR_FIXUP # fixup PCI I/O addresses
@@ -335,7 +336,7 @@
com* at pcmcom? slave ? # ...and the slave devices
# CardBus serial interfaces
-#com* at cardbus? function ? # Modems and serial cards
+#com* at cardbus? dev ? function ? # Modems and serial cards
# ISA serial interfaces
#options COM_HAYESP # adds Hayes ESP serial board support
@@ -357,6 +358,7 @@
#addcom0 at isa? port 0x108 irq 5 # Addonics FlexPort 8S
#com* at addcom? slave ?
+
# Parallel Printer Interfaces
# PCI parallel printer interfaces
@@ -367,6 +369,8 @@
lpt1 at isa? port 0x278
lpt2 at isa? port 0x3bc
+# Hardware monitors
+
# LM7[89] and compatible hardware monitors
#lm0 at isa? port 0x290 # other common ports: 0x280, 0x310
@@ -374,6 +378,7 @@
#viapm* at pci? dev ? function ?
#viaenv* at viapm?
+
# SCSI Controllers and Devices
# PCI SCSI controllers
@@ -455,6 +460,7 @@
cac* at pci? dev ? function ? # Compaq array controller
ca* at cac? unit ? # Compaq array disk device
+
# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
@@ -620,6 +626,7 @@
tqphy* at mii? phy ? # TDK Semiconductor PHYs
ukphy* at mii? phy ? # generic unknown PHYs
+
# USB Controller and Devices
# PCI USB controllers
@@ -686,6 +693,7 @@
# USB Generic driver
ugen* at uhub? port ?
+
# Audio Devices
# PCI audio devices
@@ -754,6 +762,7 @@
mpu* at ym?
# MIDI support
+midi* at clcs? # Cirrus Logic CS4280 MIDI port
#midi* at cms? # Creative Music System
midi* at eap? # 137[01] MIDI port
midi* at mpu? # MPU 401
@@ -764,11 +773,13 @@
# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0 at pcppi? # PC speaker
+
# TV cards
# Brooktree 848/849/878/879 based TV cards
bktr* at pci? dev ? function ?
+
# Mice
# ISA busmice
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/conf/INSTALL Mon Aug 07 01:08:27 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.135.2.5 2000/06/25 19:36:56 sommerfeld Exp $
+# $NetBSD: INSTALL,v 1.135.2.6 2000/08/07 01:08:29 sommerfeld Exp $
#
# INSTALL - Installation kernel.
#
@@ -76,7 +76,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options "KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/i386/bus_machdep.c
--- a/sys/arch/i386/i386/bus_machdep.c Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/i386/bus_machdep.c Mon Aug 07 01:08:27 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_machdep.c,v 1.1.2.1 2000/02/20 17:52:01 sommerfeld Exp $ */
+/* $NetBSD: bus_machdep.c,v 1.1.2.2 2000/08/07 01:08:32 sommerfeld Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -43,8 +43,7 @@
#include <sys/mbuf.h>
#include <sys/extent.h>
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
+#include <uvm/uvm_extern.h>
#define _I386_BUS_DMA_PRIVATE
#include <machine/bus.h>
@@ -757,11 +756,13 @@
* Common functin for mmap(2)'ing DMA-safe memory. May be called by
* bus-specific DMA mmap(2)'ing functions.
*/
-int
+paddr_t
_bus_dmamem_mmap(t, segs, nsegs, off, prot, flags)
bus_dma_tag_t t;
bus_dma_segment_t *segs;
- int nsegs, off, prot, flags;
+ int nsegs;
+ off_t off;
+ int prot, flags;
{
int i;
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/i386/cpu.c
--- a/sys/arch/i386/i386/cpu.c Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/i386/cpu.c Mon Aug 07 01:08:27 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
+/* $NetBSD: cpu.c,v 1.1.2.8 2000/08/07 01:08:33 sommerfeld Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -83,10 +83,6 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_page.h>
-
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/i386/genassym.cf Mon Aug 07 01:08:27 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.17.10.4 2000/06/25 23:10:18 sommerfeld Exp $
+# $NetBSD: genassym.cf,v 1.17.10.5 2000/08/07 01:08:34 sommerfeld Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -86,10 +86,7 @@
include <sys/user.h>
include <sys/mbuf.h>
-include <vm/vm.h>
-
include <uvm/uvm.h>
-include <uvm/uvm_extern.h>
include <machine/trap.h>
include <machine/pmap.h>
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/i386/ioapic.c
--- a/sys/arch/i386/i386/ioapic.c Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/i386/ioapic.c Mon Aug 07 01:08:27 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ioapic.c,v 1.1.2.4 2000/06/25 20:46:08 sommerfeld Exp $ */
+/* $NetBSD: ioapic.c,v 1.1.2.5 2000/08/07 01:08:36 sommerfeld Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -76,10 +76,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_page.h>
-
#include <machine/bus.h>
#include <machine/isa_machdep.h> /* XXX intrhand */
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/i386/ipifuncs.c
--- a/sys/arch/i386/i386/ipifuncs.c Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/i386/ipifuncs.c Mon Aug 07 01:08:27 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.1.2.4 2000/08/07 01:08:37 sommerfeld Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
#include <sys/device.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/intr.h>
#include <machine/atomic.h>
diff -r e856abfbe0c5 -r f3639486f135 sys/arch/i386/i386/lapic.c
--- a/sys/arch/i386/i386/lapic.c Tue Jul 18 11:07:22 2000 +0000
+++ b/sys/arch/i386/i386/lapic.c Mon Aug 07 01:08:27 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */
+/* $NetBSD: lapic.c,v 1.1.2.9 2000/08/07 01:08:38 sommerfeld Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,10 +48,6 @@
Home |
Main Index |
Thread Index |
Old Index