Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/chs-ubc2]: src/sys Update from trunk.
details: https://anonhg.NetBSD.org/src/rev/8b3076a395bd
branches: chs-ubc2
changeset: 471422:8b3076a395bd
user: thorpej <thorpej%NetBSD.org@localhost>
date: Mon Aug 02 21:43:51 1999 +0000
description:
Update from trunk.
diffstat:
sys/arch/sparc64/conf/GENERIC | 5 +-
sys/arch/sparc64/conf/GENERIC.v6 | 13 +-
sys/arch/sparc64/conf/GENERIC64 | 5 +-
sys/arch/sparc64/conf/Makefile.sparc64 | 12 +-
sys/arch/sparc64/conf/NONPLUS | 5 +-
sys/arch/sparc64/conf/NONPLUS64 | 5 +-
sys/arch/sparc64/conf/POWEROFSEVEN | 3 +-
sys/arch/sparc64/dev/ebus_bus.c | 4 +-
sys/arch/sparc64/dev/iommu.c | 8 +-
sys/arch/sparc64/dev/psycho.c | 4 +-
sys/arch/sparc64/dev/psycho_bus.c | 4 +-
sys/arch/sparc64/dev/sbus.c | 10 +-
sys/arch/sparc64/include/lock.h | 42 +-
sys/arch/sparc64/include/psl.h | 4 +-
sys/arch/sparc64/sparc64/clock.c | 6 +-
sys/arch/sparc64/sparc64/db_interface.c | 3 +-
sys/arch/sparc64/sparc64/locore.s | 6 +-
sys/arch/sparc64/sparc64/machdep.c | 4 +-
sys/arch/sparc64/sparc64/pmap.c | 258 ++++++++++++++++-
sys/arch/sparc64/sparc64/vm_machdep.c | 10 +-
sys/arch/sun3/conf/DISKLESS | 3 +-
sys/arch/sun3/conf/DISKLESS3X | 3 +-
sys/arch/sun3/conf/FOUR_TTYS | 3 +-
sys/arch/sun3/conf/GENERIC | 5 +-
sys/arch/sun3/conf/GENERIC.v6 | 13 +-
sys/arch/sun3/conf/GENERIC3X | 3 +-
sys/arch/sun3/conf/INSTALL | 3 +-
sys/arch/sun3/conf/INSTALL3X | 3 +-
sys/arch/sun3/conf/KGDB | 3 +-
sys/arch/sun3/conf/KGDB3X | 3 +-
sys/arch/sun3/conf/Makefile.sun3 | 9 +-
sys/arch/sun3/conf/files.sun3 | 4 +-
sys/arch/sun3/sun3/locore.s | 12 +-
sys/arch/sun3/sun3/pmap.c | 15 +-
sys/arch/sun3/sun3/vm_machdep.c | 12 +-
sys/arch/sun3/sun3x/dvma.c | 9 +-
sys/arch/sun3/sun3x/locore.s | 12 +-
sys/arch/sun3/sun3x/pmap.c | 42 +-
sys/arch/vax/boot/Makefile.inc | 6 +-
sys/arch/vax/conf/GENERIC | 3 +-
sys/arch/vax/conf/GENERIC.v6 | 13 +-
sys/arch/vax/conf/INSTALL | 3 +-
sys/arch/vax/conf/Makefile.vax | 9 +-
sys/arch/vax/conf/files.vax | 8 +-
sys/arch/vax/include/pmap.h | 98 ++++-
sys/arch/vax/vax/bus_dma.c | 4 +-
sys/arch/vax/vax/conf.c | 6 +-
sys/arch/vax/vax/pmap.c | 465 +++++++++++++++++++++----------
sys/arch/vax/vax/sgmap.c | 6 +-
sys/arch/vax/vax/trap.c | 33 +-
sys/arch/vax/vax/vm_machdep.c | 29 +-
sys/arch/x68k/conf/ALL | 3 +-
sys/arch/x68k/conf/GENERIC | 11 +-
sys/arch/x68k/conf/GENERIC.v6 | 13 +-
sys/arch/x68k/conf/INSTALL | 3 +-
sys/arch/x68k/conf/Makefile.x68k | 9 +-
sys/arch/x68k/conf/SMALL | 3 +-
sys/arch/x68k/conf/TOKOCHAN | 3 +-
sys/arch/x68k/conf/ZSCONS | 3 +-
sys/arch/x68k/conf/files.x68k | 8 +-
sys/arch/x68k/dev/intio_dmac.c | 6 +-
sys/arch/x68k/stand/Makefile | 4 +-
sys/arch/x68k/stand/loadbsd/loadbsd.c | 12 +-
sys/arch/x68k/x68k/bus.c | 4 +-
sys/arch/x68k/x68k/locore.s | 12 +-
sys/arch/x68k/x68k/pmap.c | 47 ++-
sys/arch/x68k/x68k/sys_machdep.c | 10 +-
sys/arch/x68k/x68k/trap.c | 9 +-
sys/arch/x68k/x68k/vm_machdep.c | 15 +-
sys/coda/cnode.h | 17 +-
sys/coda/coda_vnops.c | 29 +-
sys/compat/aout/syscalls.master | 4 +-
72 files changed, 1010 insertions(+), 466 deletions(-)
diffs (truncated from 3525 to 300 lines):
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/conf/GENERIC Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.13.4.1 1999/06/21 01:02:28 thorpej Exp $
+# $NetBSD: GENERIC,v 1.13.4.2 1999/08/02 21:43:51 thorpej Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -124,13 +124,14 @@
options COMPAT_11 # NetBSD 1.1 binary compatibility
options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
+options COMPAT_14 # NetBSD 1.4 binary compatibility
#options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
options COMPAT_SUNOS # SunOS 4.x binary compatibility
options COMPAT_SVR4 # SunOS 5.x binary compatibility
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
#options EXEC_ELF64 # Exec module for sparc64 & SunOs 5.x binaries. -- 64-bit only
#options SYSCALL_DEBUG
-#options COMPAT_AOUT # NetBSD/sparc compat support
+options COMPAT_AOUT # NetBSD/sparc compat support
options EXEC_AOUT # execve(2) support for a.out binaries
## File systems. You probably need at least one of FFS or NFS.
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/conf/GENERIC.v6
--- a/sys/arch/sparc64/conf/GENERIC.v6 Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/conf/GENERIC.v6 Mon Aug 02 21:43:51 1999 +0000
@@ -1,10 +1,21 @@
-# $NetBSD: GENERIC.v6,v 1.1.2.2 1999/07/01 23:23:16 thorpej Exp $
+# $NetBSD: GENERIC.v6,v 1.1.2.3 1999/08/02 21:43:51 thorpej Exp $
#
# GENERIC.v6 -- IPv6 variant of GENERIC. should be in GENERIC.
#
include "arch/sparc64/conf/GENERIC"
+# Pull in config fragments for kernel crypto. Use only one of these,
+# and adjust the prefixes as necessary.
+
+#prefix ../crypto-us/sys
+#cinclude "conf/files.crypto-us"
+#prefix
+
+#prefix ../crypto-intl/sys
+#cinclude "conf/files.crypto-intl"
+#prefix
+
# IPv6 options
options INET6 # IPV6
options IPSEC # IP security
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/conf/GENERIC64
--- a/sys/arch/sparc64/conf/GENERIC64 Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/conf/GENERIC64 Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.3.4.1 1999/06/21 01:02:28 thorpej Exp $
+# $NetBSD: GENERIC64,v 1.3.4.2 1999/08/02 21:43:51 thorpej Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -125,10 +125,11 @@
options COMPAT_11 # NetBSD 1.1 binary compatibility
options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
+options COMPAT_14 # NetBSD 1.4 binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
options COMPAT_SVR4 # SunOS 5.x binary compatibility
options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
-#options COMPAT_AOUT # NetBSD/sparc compat support
+options COMPAT_AOUT # NetBSD/sparc compat support
options EXEC_AOUT # execve(2) support for a.out binaries
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
options EXEC_ELF64 # Exec module for sparc64 & SunOs 5.x binaries.
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64 Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64 Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.8.4.1 1999/06/21 01:02:28 thorpej Exp $
+# $NetBSD: Makefile.sparc64,v 1.8.4.2 1999/08/02 21:43:51 thorpej Exp $
# Makefile for NetBSD
#
@@ -43,7 +43,8 @@
.if (${OS} == "NetBSD")
USE_GENASSYM?= no
.else
-USE_GENASSYM?= yes
+USE_GENASSYM?= no
+AWK=nawk
.endif
.if exists(/usr/ccs/bin/ld)
@@ -67,6 +68,8 @@
LINKFLAGS= -N -p -Ttext f8000000 -e start >lderr
#STRIPFLAGS= -d
+%INCLUDES
+
### find out what to use for libkern
KERN_AS= obj
.include "$S/lib/libkern/Makefile.inc"
@@ -113,8 +116,9 @@
.if ${DEBUG} == "-g"
LINKFLAGS+= -X
SYSTEM_LD_TAIL+=; \
- echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
- echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
+ echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
+ echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+ ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
LINKFLAGS+= -S
.endif
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/conf/NONPLUS
--- a/sys/arch/sparc64/conf/NONPLUS Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NONPLUS,v 1.10.4.1 1999/06/21 01:02:29 thorpej Exp $
+# $NetBSD: NONPLUS,v 1.10.4.2 1999/08/02 21:43:51 thorpej Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -128,13 +128,14 @@
options COMPAT_11 # NetBSD 1.1 binary compatibility
options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
+options COMPAT_14 # NetBSD 1.4 binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
options COMPAT_SVR4 # SunOS 5.x binary compatibility
#options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
#options EXEC_ELF64 # Exec module for SunOS 5.x binaries.
options SYSCALL_DEBUG
-#options COMPAT_AOUT # NetBSD/sparc compat support
+options COMPAT_AOUT # NetBSD/sparc compat support
options EXEC_AOUT # execve(2) support for a.out binaries
## File systems. You probably need at least one of FFS or NFS.
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/conf/NONPLUS64
--- a/sys/arch/sparc64/conf/NONPLUS64 Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS64 Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NONPLUS64,v 1.6.4.1 1999/06/21 01:02:29 thorpej Exp $
+# $NetBSD: NONPLUS64,v 1.6.4.2 1999/08/02 21:43:51 thorpej Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -127,13 +127,14 @@
options COMPAT_11 # NetBSD 1.1 binary compatibility
options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
+options COMPAT_14 # NetBSD 1.4 binary compatibility
options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
options COMPAT_SVR4 # SunOS 5.x binary compatibility
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
options EXEC_ELF64 # Exec module for SunOS 5.x binaries.
options SYSCALL_DEBUG
-#options COMPAT_AOUT # NetBSD/sparc compat support
+options COMPAT_AOUT # NetBSD/sparc compat support
options EXEC_AOUT # execve(2) support for a.out binaries
## File systems. You probably need at least one of FFS or NFS.
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/conf/POWEROFSEVEN
--- a/sys/arch/sparc64/conf/POWEROFSEVEN Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/conf/POWEROFSEVEN Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: POWEROFSEVEN,v 1.3.2.1 1999/06/21 01:02:29 thorpej Exp $
+# $NetBSD: POWEROFSEVEN,v 1.3.2.2 1999/08/02 21:43:51 thorpej Exp $
#
# Configuration for Ultra5/Ultra10
@@ -126,6 +126,7 @@
#options COMPAT_11 # NetBSD 1.1 binary compatibility
#options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
+options COMPAT_14 # NetBSD 1.4 binary compatibility
#options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
options COMPAT_SUNOS # SunOS 4.x binary compatibility
options COMPAT_SVR4 # SunOS 5.x binary compatibility
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/dev/ebus_bus.c
--- a/sys/arch/sparc64/dev/ebus_bus.c Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/dev/ebus_bus.c Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus_bus.c,v 1.2.2.2 1999/06/21 01:02:30 thorpej Exp $ */
+/* $NetBSD: ebus_bus.c,v 1.2.2.3 1999/08/02 21:43:52 thorpej Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -643,7 +643,7 @@
/*
* Get the physical address for this page.
*/
- if ((curaddr = (bus_addr_t)pmap_extract(pmap, (vaddr_t)vaddr)) == NULL) {
+ if (pmap_extract(pmap, (vaddr_t)vaddr, &curaddr) == FALSE) {
bus_dmamap_unload(t, map);
return (-1);
}
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/dev/iommu.c
--- a/sys/arch/sparc64/dev/iommu.c Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/dev/iommu.c Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.2.2.2 1999/06/21 01:02:30 thorpej Exp $ */
+/* $NetBSD: iommu.c,v 1.2.2.3 1999/08/02 21:43:52 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -150,7 +150,8 @@
is->is_dvmabase = IOTSB_VSTART(is->is_tsbsize) + NBPG;
is->is_tsbsize = tsbsize;
is->is_tsb = malloc(NBPG, M_DMAMAP, M_WAITOK); /* XXX */
- is->is_ptsb = pmap_extract(pmap_kernel(), (vaddr_t)is->is_tsb);
+ (void) pmap_extract(pmap_kernel(), (vaddr_t)is->is_tsb,
+ (paddr_t *)&is->is_ptsb);
#ifdef DEBUG
if (iommudebug & IDB_DVMA)
@@ -172,7 +173,8 @@
/*
* Initialize streaming buffer.
*/
- is->is_flushpa = pmap_extract(pmap_kernel(), (vaddr_t)&is->is_flush);
+ (void) pmap_extract(pmap_kernel(), (vaddr_t)&is->is_flush,
+ (paddr_t *)&is->is_flushpa);
/*
* now actually start up the IOMMU
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/dev/psycho.c
--- a/sys/arch/sparc64/dev/psycho.c Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/dev/psycho.c Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.1.2.1 1999/06/21 01:02:31 thorpej Exp $ */
+/* $NetBSD: psycho.c,v 1.1.2.2 1999/08/02 21:43:52 thorpej Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -473,8 +473,6 @@
panic("couldn't malloc iommu name");
snprintf(name, 32, "%s dvma", sc->sc_dev.dv_xname);
- DPRINTF(PDB_IOMMU, ("psycho base %p phys %p\n", (long)sc->sc_regs, (long)pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_regs)));
-
/* XXX XXX XXX FIX ME tsbsize XXX XXX XXX */
iommu_init(name, &sc->sc_is, 0);
}
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/dev/psycho_bus.c
--- a/sys/arch/sparc64/dev/psycho_bus.c Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/dev/psycho_bus.c Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho_bus.c,v 1.2.2.2 1999/06/21 01:02:31 thorpej Exp $ */
+/* $NetBSD: psycho_bus.c,v 1.2.2.3 1999/08/02 21:43:52 thorpej Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
@@ -743,7 +743,7 @@
/*
* Get the physical address for this page.
*/
- if ((curaddr = (bus_addr_t)pmap_extract(pmap, (vaddr_t)vaddr)) == NULL) {
+ if (pmap_extract(pmap, (vaddr_t)vaddr, &curaddr) == FALSE) {
bus_dmamap_unload(t, map);
return (-1);
}
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/dev/sbus.c
--- a/sys/arch/sparc64/dev/sbus.c Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/dev/sbus.c Mon Aug 02 21:43:51 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.11.4.1 1999/06/21 01:02:32 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.11.4.2 1999/08/02 21:43:52 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -320,12 +320,6 @@
sc->sc_is.is_iommu = &sc->sc_sysio->sys_iommu;
sc->sc_is.is_sb = &sc->sc_sysio->sys_strbuf;
-#ifdef DEBUG
- if (sbusdebug & SDB_DVMA)
- printf("sysio base %p phys %p\n",
- (long)sc->sc_sysio, (long)pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_sysio));
-#endif
-
/* XXX should have instance number */
iommu_init("SBus dvma", &sc->sc_is, 0);
@@ -866,7 +860,7 @@
/*
* Get the physical address for this page.
*/
- if ((curaddr = (bus_addr_t)pmap_extract(pmap, (vaddr_t)vaddr)) == NULL) {
+ if (pmap_extract(pmap, (vaddr_t)vaddr, &curaddr) == FALSE) {
bus_dmamap_unload(t, map);
return (-1);
}
diff -r 2f0fa69c9ae0 -r 8b3076a395bd sys/arch/sparc64/include/lock.h
--- a/sys/arch/sparc64/include/lock.h Mon Aug 02 19:57:20 1999 +0000
+++ b/sys/arch/sparc64/include/lock.h Mon Aug 02 21:43:51 1999 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: lock.h,v 1.1.2.1 1999/06/21 01:02:33 thorpej Exp $ */
+/* $NetBSD: lock.h,v 1.1.2.2 1999/08/02 21:43:53 thorpej Exp $ */
Home |
Main Index |
Thread Index |
Old Index