Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/c979d3b57a11
branches: thorpej_scsipi
changeset: 477342:c979d3b57a11
user: bouyer <bouyer%NetBSD.org@localhost>
date: Fri Dec 08 09:18:42 2000 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/alpha/alpha/compat_13_machdep.c | 6 +-
sys/arch/alpha/alpha/conf.c | 12 +-
sys/arch/alpha/alpha/cpu.c | 79 +-
sys/arch/alpha/alpha/db_interface.c | 165 +-
sys/arch/alpha/alpha/db_trace.c | 7 +-
sys/arch/alpha/alpha/genassym.c | 252 ---
sys/arch/alpha/alpha/genassym.cf | 175 ++
sys/arch/alpha/alpha/interrupt.c | 6 +-
sys/arch/alpha/alpha/ipifuncs.c | 112 +-
sys/arch/alpha/alpha/linux_sigcode.s | 105 +
sys/arch/alpha/alpha/locore.s | 41 +-
sys/arch/alpha/alpha/machdep.c | 152 +-
sys/arch/alpha/alpha/osf1_locore.s | 8 +-
sys/arch/alpha/alpha/pmap.c | 151 +-
sys/arch/alpha/alpha/process_machdep.c | 8 +-
sys/arch/alpha/alpha/trap.c | 48 +-
sys/arch/alpha/alpha/vm_machdep.c | 12 +-
sys/arch/alpha/conf/ALPHA | 6 +-
sys/arch/alpha/conf/BABYLON | 285 ----
sys/arch/alpha/conf/BASIL | 446 ++++++
sys/arch/alpha/conf/ENIWETOK | 6 +-
sys/arch/alpha/conf/GENERIC | 6 +-
sys/arch/alpha/conf/INSTALL | 4 +-
sys/arch/alpha/conf/Makefile.alpha | 16 +-
sys/arch/alpha/conf/files.alpha | 7 +-
sys/arch/alpha/include/alpha.h | 11 +-
sys/arch/alpha/include/cpu.h | 6 +-
sys/arch/alpha/include/db_machdep.h | 6 +-
sys/arch/alpha/include/intr.h | 5 +-
sys/arch/alpha/include/lock.h | 9 +-
sys/arch/alpha/include/pmap.h | 7 +-
sys/arch/alpha/pci/irongate.c | 10 +-
sys/arch/alpha/pci/irongate_bus_mem.c | 30 +-
sys/arch/alpha/pci/irongatevar.h | 4 +-
sys/arch/alpha/pci/tsc.c | 14 +-
sys/arch/alpha/pci/tsp_bus_mem.c | 33 +-
sys/arch/alpha/pci/tsvar.h | 4 +-
sys/arch/amiga/amiga/genassym.cf | 8 +-
sys/arch/amiga/amiga/locore.s | 68 +-
sys/arch/arc/arc/machdep.c | 21 +-
sys/arch/arc/conf/Makefile.arc | 242 ---
sys/arch/arc/conf/Makefile.arc.inc | 15 +
sys/arch/arc/conf/std.arc | 5 +-
sys/arch/arm26/Makefile | 4 +-
sys/arch/arm26/boot/BBBB,fd1 | 461 ------
sys/arch/arm26/boot/BBBB,ffb.uue | 319 ----
sys/arch/arm26/conf/files.arm26 | 7 +-
sys/arch/arm26/include/param.h | 9 +-
sys/arch/arm26/include/vmparam.h | 7 +-
sys/arch/arm26/ioc/iic.c | 5 +-
sys/arch/arm26/ioc/rtc.c | 7 +-
sys/arch/arm26/podulebus/if_eh.c | 698 +++++++++
sys/arch/arm26/podulebus/if_ehreg.h | 26 +
sys/arch/arm32/arm32/db_interface.c | 4 +-
sys/arch/arm32/arm32/db_machdep.c | 60 +-
sys/arch/arm32/arm32/syscall.c | 4 +-
sys/arch/arm32/include/vmparam.h | 7 +-
sys/arch/arm32/podulebus/podule_data.h | 31 +-
sys/arch/arm32/podulebus/podules | 11 +-
sys/arch/arm32/podulebus/podules.h | 30 +-
sys/arch/atari/atari/genassym.cf | 8 +-
sys/arch/atari/atari/locore.s | 68 +-
sys/arch/atari/dev/md_root.c | 3 +-
sys/arch/bebox/bebox/locore.s | 5 +-
sys/arch/cobalt/cobalt/conf.c | 8 +-
sys/arch/cobalt/cobalt/machdep.c | 12 +-
sys/arch/cobalt/conf/Makefile.cobalt | 239 ---
sys/arch/cobalt/conf/RAQ | 4 +-
sys/arch/cobalt/conf/files.cobalt | 4 +-
sys/arch/cobalt/conf/std.cobalt | 5 +-
sys/arch/hp300/dev/apci.c | 4 +-
sys/arch/hp300/dev/dca.c | 7 +-
sys/arch/hp300/dev/ite.c | 6 +-
sys/arch/hp300/hp300/genassym.cf | 8 +-
sys/arch/hp300/hp300/locore.s | 28 +-
sys/arch/hp300/hp300/trap.c | 4 +-
sys/arch/hp300/include/hp300spu.h | 4 +-
sys/arch/hp300/include/vmparam.h | 5 +-
sys/arch/hp300/stand/Makefile.inc | 16 +-
sys/arch/hpcmips/conf/GENERIC | 9 +-
sys/arch/hpcmips/conf/std.hpcmips | 5 +-
sys/arch/hpcmips/dev/bivideo.c | 11 +-
sys/arch/hpcmips/dev/hpcfb.c | 591 +++++--
sys/arch/hpcmips/dev/hpcfbio.h | 6 +-
sys/arch/hpcmips/dev/ite8181.c | 9 +-
sys/arch/hpcmips/dev/mq200.c | 13 +-
sys/arch/hpcmips/dev/mq200reg.h | 552 +++++++-
sys/arch/hpcmips/dev/plumvideo.c | 6 +-
sys/arch/hpcmips/hpcmips/machdep.c | 5 +-
sys/arch/hpcmips/include/vmparam.h | 5 +-
sys/arch/hpcmips/tx/tx3912video.c | 7 +-
sys/arch/hpcmips/vr/vrpiu.c | 313 +++-
sys/arch/hpcmips/vr/vrpiuvar.h | 33 +-
sys/arch/i386/conf/CARDBUS | 10 +-
sys/arch/i386/conf/GENERIC | 14 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 8 +-
sys/arch/i386/conf/INSTALL | 8 +-
sys/arch/i386/conf/INSTALL_SMALL | 8 +-
sys/arch/i386/conf/INSTALL_TINY | 4 +-
sys/arch/i386/conf/LAMB | 365 +++++
sys/arch/i386/conf/NBFTP | 3 +-
sys/arch/i386/conf/files.i386 | 12 +-
sys/arch/i386/i386/apm.c | 8 +-
sys/arch/i386/i386/autoconf.c | 10 +-
sys/arch/i386/i386/conf.c | 16 +-
sys/arch/i386/i386/db_disasm.c | 103 +-
sys/arch/i386/i386/freebsd_machdep.c | 4 +-
sys/arch/i386/i386/freebsd_sigcode.s | 99 +
sys/arch/i386/i386/genassym.cf | 8 +-
sys/arch/i386/i386/ibcs2_machdep.c | 4 +-
sys/arch/i386/i386/ibcs2_sigcode.s | 101 +
sys/arch/i386/i386/ibcs2_syscall.c | 266 +++
sys/arch/i386/i386/linux_sigcode.s | 131 +
sys/arch/i386/i386/linux_syscall.c | 265 +++
sys/arch/i386/i386/locore.s | 151 +--
sys/arch/i386/i386/machdep.c | 19 +-
sys/arch/i386/i386/pmap.c | 42 +-
sys/arch/i386/i386/svr4_machdep.c | 4 +-
sys/arch/i386/i386/svr4_sigcode.s | 184 ++
sys/arch/i386/i386/trap.c | 109 +-
sys/arch/i386/include/ibcs2_machdep.h | 6 +-
sys/arch/i386/include/pc/display.h | 47 -
sys/arch/i386/include/pc/msdos.h | 65 -
sys/arch/i386/include/pmap.h | 4 +-
sys/arch/i386/isa/pccons.c | 4 +-
sys/arch/luna68k/include/param.h | 4 +-
sys/arch/luna68k/luna68k/disksubr.c | 17 +-
sys/arch/luna68k/luna68k/genassym.cf | 6 +-
sys/arch/luna68k/luna68k/locore.s | 28 +-
sys/arch/luna68k/luna68k/trap.c | 6 +-
sys/arch/m68k/060sp/Makefile.inc | 5 +-
sys/arch/m68k/060sp/copyright.S | 6 +-
sys/arch/m68k/060sp/fnetbsd.S | 235 +-
sys/arch/m68k/060sp/inetbsd.S | 165 +-
sys/arch/m68k/060sp/netbsd060sp.S | 209 +-
sys/arch/m68k/fpsp/asm2gas | 94 +-
sys/arch/m68k/include/profile.h | 20 +-
sys/arch/m68k/m68k/sigcode.s | 37 +-
sys/arch/m68k/m68k/sunos_sigcode.s | 66 +
sys/arch/m68k/m68k/svr4_sigcode.s | 79 +
sys/arch/mac68k/conf/GENERICSBC | 264 +++
sys/arch/mac68k/conf/INSTALLSBC | 185 ++
sys/arch/mac68k/include/vmparam.h | 5 +-
sys/arch/mac68k/mac68k/genassym.cf | 8 +-
sys/arch/mac68k/mac68k/locore.s | 28 +-
sys/arch/mac68k/mac68k/machdep.c | 4 +-
sys/arch/mac68k/mac68k/trap.c | 4 +-
sys/arch/mac68k/nubus/nubus.h | 12 +-
sys/arch/mac68k/obio/grf_obio.c | 34 +-
sys/arch/macppc/conf/GENERIC | 8 +-
sys/arch/macppc/conf/GENERIC_MD | 8 +-
sys/arch/macppc/conf/POWERMAC | 3 +-
sys/arch/macppc/include/intr.h | 75 +-
sys/arch/macppc/include/vmparam.h | 7 +-
sys/arch/macppc/macppc/extintr.c | 62 +-
sys/arch/macppc/macppc/locore.S | 18 +-
sys/arch/mips/conf/Makefile.mips | 286 ++++
sys/arch/mips/include/cpuregs.h | 10 +-
sys/arch/mips/mips/cpu_exec.c | 20 +-
sys/arch/mips/mips/locore_mips3.S | 67 +-
sys/arch/mips/mips/mips_machdep.c | 11 +-
sys/arch/mips/mips/pmap.c | 8 +-
sys/arch/mipsco/conf/Makefile.mipsco | 219 ---
sys/arch/mipsco/conf/Makefile.mipsco.inc | 12 +
sys/arch/mipsco/conf/std.mipsco | 6 +-
sys/arch/mipsco/include/prom.h | 7 +-
sys/arch/mipsco/mipsco/machdep.c | 24 +-
sys/arch/mipsco/mipsco/mips_3x30.c | 19 +-
sys/arch/mipsco/mipsco/prom.c | 8 +-
sys/arch/mipsco/obio/asc.c | 110 +-
sys/arch/mipsco/obio/i82072.c | 77 +-
sys/arch/mipsco/obio/mkclock.c | 13 +-
sys/arch/mipsco/obio/zs.c | 14 +-
sys/arch/mvme68k/conf/GENERIC | 38 +-
sys/arch/mvme68k/conf/RAMDISK | 80 +-
sys/arch/mvme68k/conf/VME147 | 22 +-
sys/arch/mvme68k/conf/VME162 | 18 +-
sys/arch/mvme68k/conf/VME167 | 22 +-
sys/arch/mvme68k/conf/VME172 | 20 +-
sys/arch/mvme68k/conf/VME177 | 22 +-
sys/arch/mvme68k/conf/files.mvme68k | 12 +-
sys/arch/mvme68k/conf/std.mvme68k | 3 +-
sys/arch/mvme68k/dev/clmpcc_pcctwo.c | 25 +-
sys/arch/mvme68k/dev/mainbus.c | 73 +-
sys/arch/mvme68k/dev/mainbus.h | 5 +-
sys/arch/mvme68k/dev/md_root.c | 93 -
sys/arch/mvme68k/dev/memc.c | 167 ++
sys/arch/mvme68k/dev/memcreg.h | 118 +
sys/arch/mvme68k/dev/mvmebus.c | 39 +-
sys/arch/mvme68k/dev/mvmebus.h | 3 +-
sys/arch/mvme68k/dev/pcc.c | 5 +-
sys/arch/mvme68k/dev/pcctwo.c | 9 +-
sys/arch/mvme68k/dev/pcctworeg.h | 5 +-
sys/arch/mvme68k/dev/pcctwovar.h | 4 +-
sys/arch/mvme68k/dev/pccvar.h | 4 +-
sys/arch/mvme68k/dev/vme_pcc.c | 29 +-
sys/arch/mvme68k/dev/vme_pccreg.h | 6 +-
sys/arch/mvme68k/dev/vme_pccvar.h | 3 +-
sys/arch/mvme68k/dev/vme_two.c | 25 +-
sys/arch/mvme68k/dev/vme_tworeg.h | 6 +-
sys/arch/mvme68k/dev/vme_twovar.h | 3 +-
sys/arch/mvme68k/dev/zs_pcc.c | 6 +-
sys/arch/mvme68k/dev/zs_pcctwo.c | 6 +-
sys/arch/mvme68k/include/Makefile | 11 +-
sys/arch/mvme68k/include/bus_dma.h | 5 +-
sys/arch/mvme68k/include/bus_space.h | 414 +++--
sys/arch/mvme68k/include/cpu.h | 3 +-
sys/arch/mvme68k/include/db_machdep.h | 6 +-
sys/arch/mvme68k/include/disklabel.h | 4 +-
sys/arch/mvme68k/include/loadfile_machdep.h | 75 +
sys/arch/mvme68k/include/param.h | 4 +-
sys/arch/mvme68k/include/prom.h | 44 +-
sys/arch/mvme68k/include/vmparam.h | 5 +-
sys/arch/mvme68k/mvme68k/bus_space.c | 236 ++-
sys/arch/mvme68k/mvme68k/genassym.cf | 8 +-
sys/arch/mvme68k/mvme68k/locore.s | 1352 +++++++++---------
sys/arch/mvme68k/mvme68k/machdep.c | 70 +-
sys/arch/mvme68k/mvme68k/pmap.c | 3 +-
sys/arch/mvme68k/mvme68k/softintr.c | 21 +-
sys/arch/mvme68k/mvme68k/trap.c | 27 +-
sys/arch/mvme68k/mvme68k/vm_machdep.c | 100 +-
sys/arch/mvme68k/stand/Makefile.booters | 12 +-
sys/arch/mvme68k/stand/bootsd/Makefile | 3 +-
sys/arch/mvme68k/stand/bootst/Makefile | 8 +-
sys/arch/mvme68k/stand/bootxx/Makefile | 8 +-
sys/arch/mvme68k/stand/bootxx/block_x.S | 15 +
sys/arch/mvme68k/stand/bootxx/bootxx.c | 59 +-
sys/arch/mvme68k/stand/bootxx/bootxx.h | 5 +
sys/arch/mvme68k/stand/installboot/Makefile | 9 +-
sys/arch/mvme68k/stand/installboot/installboot.c | 106 +-
sys/arch/mvme68k/stand/libbug/Makefile | 18 +-
sys/arch/mvme68k/stand/libbug/bugcrt.c | 72 +-
sys/msdosfs/msdosfs_denode.c | 5 +-
sys/msdosfs/msdosfs_fat.c | 51 +-
sys/msdosfs/msdosfs_vfsops.c | 5 +-
sys/msdosfs/msdosfs_vnops.c | 188 +-
sys/netinet/ip_input.c | 5 +-
sys/netinet/udp_usrreq.c | 10 +-
sys/netinet6/in6.c | 5 +-
sys/nfs/nfs.h | 18 +-
sys/nfs/nfs_bio.c | 1056 +++++++++-----
sys/nfs/nfs_bootdhcp.c | 5 +-
sys/nfs/nfs_node.c | 33 +-
sys/nfs/nfs_nqlease.c | 16 +-
sys/nfs/nfs_serv.c | 12 +-
sys/nfs/nfs_subs.c | 88 +-
sys/nfs/nfs_syscalls.c | 14 +-
sys/nfs/nfs_var.h | 26 +-
sys/nfs/nfs_vfsops.c | 4 +-
sys/nfs/nfs_vnops.c | 188 +-
sys/nfs/nfsnode.h | 8 +-
sys/sys/buf.h | 16 +-
sys/sys/conf.h | 8 +-
sys/sys/device.h | 4 +-
sys/sys/disklabel.h | 4 +-
sys/sys/exec.h | 8 +-
sys/sys/lock.h | 39 +-
sys/sys/mbuf.h | 7 +-
sys/sys/mount.h | 4 +-
sys/sys/namei.h | 3 +-
sys/sys/param.h | 15 +-
sys/sys/pool.h | 81 +-
sys/sys/proc.h | 15 +-
sys/sys/systm.h | 11 +-
sys/sys/vnode.h | 22 +-
sys/sys/vnode_if.h | 152 ++-
sys/ufs/ext2fs/ext2fs_balloc.c | 268 +++-
sys/ufs/ext2fs/ext2fs_extern.h | 5 +-
sys/ufs/ext2fs/ext2fs_inode.c | 67 +-
sys/ufs/ext2fs/ext2fs_readwrite.c | 104 +-
sys/ufs/ext2fs/ext2fs_vfsops.c | 7 +-
sys/ufs/ext2fs/ext2fs_vnops.c | 15 +-
sys/ufs/ffs/ffs_alloc.c | 99 +-
sys/ufs/ffs/ffs_balloc.c | 221 ++-
sys/ufs/ffs/ffs_extern.h | 6 +-
sys/ufs/ffs/ffs_inode.c | 130 +-
sys/ufs/ffs/ffs_softdep.c | 348 ++++-
sys/ufs/ffs/ffs_vfsops.c | 14 +-
sys/ufs/ffs/ffs_vnops.c | 102 +-
sys/ufs/lfs/lfs_alloc.c | 244 ++-
sys/ufs/lfs/lfs_bio.c | 47 +-
sys/ufs/lfs/lfs_cksum.c | 18 +-
sys/ufs/lfs/lfs_extern.h | 17 +-
sys/ufs/lfs/lfs_inode.c | 17 +-
sys/ufs/lfs/lfs_segment.c | 46 +-
sys/ufs/lfs/lfs_syscalls.c | 66 +-
sys/ufs/lfs/lfs_vfsops.c | 541 +++++++-
sys/ufs/mfs/mfs_vnops.c | 4 +-
sys/ufs/ufs/ufs_bmap.c | 20 +-
sys/ufs/ufs/ufs_extern.h | 3 +-
sys/ufs/ufs/ufs_inode.c | 157 ++-
sys/ufs/ufs/ufs_readwrite.c | 139 +-
sys/ufs/ufs/ufs_vnops.c | 5 +-
sys/ufs/ufs/ufsmount.h | 3 +-
sys/uvm/uvm.h | 13 +-
sys/uvm/uvm_amap.c | 32 +-
sys/uvm/uvm_amap.h | 8 +-
sys/uvm/uvm_amap_i.h | 43 +-
sys/uvm/uvm_anon.c | 26 +-
sys/uvm/uvm_aobj.c | 46 +-
sys/uvm/uvm_bio.c | 549 +++++++
sys/uvm/uvm_ddb.h | 19 +-
sys/uvm/uvm_device.c | 112 +-
sys/uvm/uvm_extern.h | 140 +-
sys/uvm/uvm_fault.c | 181 +-
sys/uvm/uvm_glue.c | 49 +-
sys/uvm/uvm_km.c | 101 +-
sys/uvm/uvm_map.c | 370 ++---
sys/uvm/uvm_map_i.h | 26 +-
sys/uvm/uvm_meter.c | 106 +-
sys/uvm/uvm_mmap.c | 60 +-
sys/uvm/uvm_page.c | 154 +-
sys/uvm/uvm_page.h | 74 +-
sys/uvm/uvm_page_i.h | 25 +-
sys/uvm/uvm_pager.c | 284 +++-
sys/uvm/uvm_pager.h | 47 +-
sys/uvm/uvm_pager_i.h | 12 +-
sys/uvm/uvm_param.h | 8 +-
sys/uvm/uvm_pdaemon.c | 469 +++---
sys/uvm/uvm_pglist.c | 41 +-
sys/uvm/uvm_stat.c | 57 +-
sys/uvm/uvm_swap.c | 267 +---
sys/uvm/uvm_vnode.c | 1564 ++++-----------------
sys/uvm/uvm_vnode.h | 52 +-
324 files changed, 14688 insertions(+), 9661 deletions(-)
diffs (truncated from 39288 to 300 lines):
diff -r 22f48a9cf731 -r c979d3b57a11 sys/arch/alpha/alpha/compat_13_machdep.c
--- a/sys/arch/alpha/alpha/compat_13_machdep.c Fri Dec 08 09:06:21 2000 +0000
+++ b/sys/arch/alpha/alpha/compat_13_machdep.c Fri Dec 08 09:18:42 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_machdep.c,v 1.6.2.1 2000/11/20 19:56:20 bouyer Exp $ */
+/* $NetBSD: compat_13_machdep.c,v 1.6.2.2 2000/12/08 09:23:19 bouyer Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.6.2.1 2000/11/20 19:56:20 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.6.2.2 2000/12/08 09:23:19 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,7 +93,7 @@
/* XXX ksc.sc_ownedfp ? */
if (p->p_addr->u_pcb.pcb_fpcpu != NULL)
- synchronize_fpstate(p, 0);
+ fpusave_proc(p, 0);
bcopy((struct fpreg *)ksc.sc_fpregs, &p->p_addr->u_pcb.pcb_fp,
sizeof(struct fpreg));
/* XXX ksc.sc_fp_control ? */
diff -r 22f48a9cf731 -r c979d3b57a11 sys/arch/alpha/alpha/conf.c
--- a/sys/arch/alpha/alpha/conf.c Fri Dec 08 09:06:21 2000 +0000
+++ b/sys/arch/alpha/alpha/conf.c Fri Dec 08 09:18:42 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.41.2.1 2000/11/20 19:56:21 bouyer Exp $ */
+/* $NetBSD: conf.c,v 1.41.2.2 2000/12/08 09:23:20 bouyer Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.41.2.1 2000/11/20 19:56:21 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.41.2.2 2000/12/08 09:23:20 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,8 +70,8 @@
bdev_decl(ccd);
#include "md.h"
bdev_decl(md);
-#include "lsu.h"
-bdev_decl(lsu);
+#include "ld.h"
+bdev_decl(ld);
struct bdevsw bdevsw[] =
{
@@ -92,7 +92,7 @@
bdev_lkm_dummy(), /* 14 */
bdev_lkm_dummy(), /* 15 */
bdev_disk_init(NRAID,raid), /* 16: RAIDframe disk driver */
- bdev_disk_init(NLSU,lsu), /* 17: logical storage unit */
+ bdev_disk_init(NLD,ld), /* 17: logical disk driver */
};
int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
@@ -334,7 +334,7 @@
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
cdev_tty_init(NUCOM, ucom), /* 57: USB tty */
cdev_ses_init(NSES,ses), /* 58: SCSI SES/SAF-TE */
- cdev_disk_init(NLSU,lsu), /* 59: logical storage unit */
+ cdev_disk_init(NLD,ld), /* 59: logical disk driver */
cdev_tty_init(NCY,cy), /* 60: Cyclades Cyclom-Y serial */
cdev_tty_init(NCZ,cztty), /* 61: Cyclades-Z serial */
cdev_usbdev_init(NURIO,urio), /* 62: Diamond Rio 500 */
diff -r 22f48a9cf731 -r c979d3b57a11 sys/arch/alpha/alpha/cpu.c
--- a/sys/arch/alpha/alpha/cpu.c Fri Dec 08 09:06:21 2000 +0000
+++ b/sys/arch/alpha/alpha/cpu.c Fri Dec 08 09:18:42 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.39.2.2 2000/11/22 15:59:39 bouyer Exp $ */
+/* $NetBSD: cpu.c,v 1.39.2.3 2000/12/08 09:23:20 bouyer Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -66,8 +66,9 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39.2.2 2000/11/22 15:59:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39.2.3 2000/12/08 09:23:20 bouyer Exp $");
+#include "opt_ddb.h"
#include "opt_multiprocessor.h"
#include <sys/param.h>
@@ -481,9 +482,6 @@
void
cpu_pause_resume(u_long cpu_id, int pause)
{
-#if 1
- return;
-#else
u_long cpu_mask = (1UL << cpu_id);
if (pause) {
@@ -491,7 +489,6 @@
alpha_send_ipi(cpu_id, ALPHA_IPI_PAUSE);
} else
atomic_clearbits_ulong(&cpus_paused, cpu_mask);
-#endif
}
void
@@ -509,38 +506,21 @@
}
void
-cpu_halt_secondary(cpu_id)
- u_long cpu_id;
+cpu_halt(void)
{
- long timeout;
- u_long cpumask = (1UL << cpu_id);
+ struct cpu_info *ci = curcpu();
+ u_long cpu_id = cpu_number();
+ struct pcs *pcsp = LOCATE_PCS(hwrpb, cpu_id);
-#ifdef DIAGNOSTIC
- if (cpu_id >= hwrpb->rpb_pcs_cnt ||
- cpu_info[cpu_id].ci_softc == NULL)
- panic("cpu_halt_secondary: bogus cpu_id");
-#endif
+ printf("%s: shutting down...\n", ci->ci_softc->sc_dev.dv_xname);
- alpha_mb();
- if ((cpus_running & cpumask) == 0) {
- /* Processor not running. */
- return;
- }
-
- /* Send the HALT IPI to the secondary. */
- alpha_send_ipi(cpu_id, ALPHA_IPI_HALT);
+ pcsp->pcs_flags &= ~(PCS_RC | PCS_HALT_REQ);
+ pcsp->pcs_flags |= PCS_HALT_STAY_HALTED;
- /* ...and wait for it to shut down. */
- for (timeout = 10000; timeout != 0; timeout--) {
- alpha_mb();
- if ((cpus_running & cpumask) == 0)
- return;
- delay(1000);
- }
+ atomic_clearbits_ulong(&cpus_running, (1UL << cpu_id));
- /* Erk, secondary failed to halt. */
- printf("WARNING: %s (ID %lu) failed to halt\n",
- cpu_info[cpu_id].ci_softc->sc_dev.dv_xname, cpu_id);
+ alpha_pal_halt();
+ /* NOTREACHED */
}
void
@@ -644,4 +624,37 @@
hwrpb->rpb_txrdy = 0;
alpha_mb();
}
+
+#if defined(DDB)
+
+#include <ddb/db_output.h>
+#include <machine/db_machdep.h>
+
+/*
+ * Dump CPU information from DDB.
+ */
+void
+cpu_debug_dump(void)
+{
+ struct cpu_info *ci;
+ int i;
+
+ db_printf("addr dev id flags ipis curproc fpcurproc\n");
+ for (i = 0; i < ALPHA_MAXPROCS; i++) {
+ ci = &cpu_info[i];
+ if (ci->ci_softc == NULL)
+ continue;
+ db_printf("%p %s %lu %lx %lx %p %p\n",
+ ci,
+ ci->ci_softc->sc_dev.dv_xname,
+ ci->ci_cpuid,
+ ci->ci_flags,
+ ci->ci_ipis,
+ ci->ci_curproc,
+ ci->ci_fpcurproc);
+ }
+}
+
+#endif /* DDB */
+
#endif /* MULTIPROCESSOR */
diff -r 22f48a9cf731 -r c979d3b57a11 sys/arch/alpha/alpha/db_interface.c
--- a/sys/arch/alpha/alpha/db_interface.c Fri Dec 08 09:06:21 2000 +0000
+++ b/sys/arch/alpha/alpha/db_interface.c Fri Dec 08 09:18:42 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.8.2.1 2000/11/20 19:56:22 bouyer Exp $ */
+/* $NetBSD: db_interface.c,v 1.8.2.2 2000/12/08 09:23:21 bouyer Exp $ */
/*
* Mach Operating System
@@ -48,10 +48,11 @@
*/
#include "opt_ddb.h"
+#include "opt_multiprocessor.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.8.2.1 2000/11/20 19:56:22 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.8.2.2 2000/12/08 09:23:21 bouyer Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -62,6 +63,7 @@
#include <dev/cons.h>
+#include <machine/alpha.h>
#include <machine/db_machdep.h>
#include <machine/pal.h>
#include <machine/prom.h>
@@ -86,54 +88,82 @@
int db_active = 0;
-void db_mach_halt __P((db_expr_t, int, db_expr_t, char *));
-void db_mach_reboot __P((db_expr_t, int, db_expr_t, char *));
+db_regs_t *ddb_regp;
+
+#if defined(MULTIPROCESSOR)
+void db_mach_cpu __P((db_expr_t, int, db_expr_t, char *));
+#endif
struct db_command db_machine_cmds[] = {
- { "halt", db_mach_halt, 0, 0 },
- { "reboot", db_mach_reboot, 0, 0 },
+#if defined(MULTIPROCESSOR)
+ { "cpu", db_mach_cpu, 0, 0 },
+#endif
{ (char *)0, },
};
+int db_alpha_regop __P((struct db_variable *, db_expr_t *, int));
+
+#define dbreg(xx) ((long *)(xx))
+
struct db_variable db_regs[] = {
- { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL },
- { "t0", &ddb_regs.tf_regs[FRAME_T0], FCN_NULL },
- { "t1", &ddb_regs.tf_regs[FRAME_T1], FCN_NULL },
- { "t2", &ddb_regs.tf_regs[FRAME_T2], FCN_NULL },
- { "t3", &ddb_regs.tf_regs[FRAME_T3], FCN_NULL },
- { "t4", &ddb_regs.tf_regs[FRAME_T4], FCN_NULL },
- { "t5", &ddb_regs.tf_regs[FRAME_T5], FCN_NULL },
- { "t6", &ddb_regs.tf_regs[FRAME_T6], FCN_NULL },
- { "t7", &ddb_regs.tf_regs[FRAME_T7], FCN_NULL },
- { "s0", &ddb_regs.tf_regs[FRAME_S0], FCN_NULL },
- { "s1", &ddb_regs.tf_regs[FRAME_S1], FCN_NULL },
- { "s2", &ddb_regs.tf_regs[FRAME_S2], FCN_NULL },
- { "s3", &ddb_regs.tf_regs[FRAME_S3], FCN_NULL },
- { "s4", &ddb_regs.tf_regs[FRAME_S4], FCN_NULL },
- { "s5", &ddb_regs.tf_regs[FRAME_S5], FCN_NULL },
- { "s6", &ddb_regs.tf_regs[FRAME_S6], FCN_NULL },
- { "a0", &ddb_regs.tf_regs[FRAME_A0], FCN_NULL },
- { "a1", &ddb_regs.tf_regs[FRAME_A1], FCN_NULL },
- { "a2", &ddb_regs.tf_regs[FRAME_A2], FCN_NULL },
- { "a3", &ddb_regs.tf_regs[FRAME_A3], FCN_NULL },
- { "a4", &ddb_regs.tf_regs[FRAME_A4], FCN_NULL },
- { "a5", &ddb_regs.tf_regs[FRAME_A5], FCN_NULL },
- { "t8", &ddb_regs.tf_regs[FRAME_T8], FCN_NULL },
- { "t9", &ddb_regs.tf_regs[FRAME_T9], FCN_NULL },
- { "t10", &ddb_regs.tf_regs[FRAME_T10], FCN_NULL },
- { "t11", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL },
- { "ra", &ddb_regs.tf_regs[FRAME_RA], FCN_NULL },
- { "t12", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL },
- { "at", &ddb_regs.tf_regs[FRAME_AT], FCN_NULL },
- { "gp", &ddb_regs.tf_regs[FRAME_GP], FCN_NULL },
- { "sp", &ddb_regs.tf_regs[FRAME_SP], FCN_NULL },
- { "pc", &ddb_regs.tf_regs[FRAME_PC], FCN_NULL },
- { "ps", &ddb_regs.tf_regs[FRAME_PS], FCN_NULL },
- { "ai", &ddb_regs.tf_regs[FRAME_T11], FCN_NULL },
- { "pv", &ddb_regs.tf_regs[FRAME_T12], FCN_NULL },
+ { "v0", dbreg(FRAME_V0), db_alpha_regop },
+ { "t0", dbreg(FRAME_T0), db_alpha_regop },
+ { "t1", dbreg(FRAME_T1), db_alpha_regop },
+ { "t2", dbreg(FRAME_T2), db_alpha_regop },
+ { "t3", dbreg(FRAME_T3), db_alpha_regop },
+ { "t4", dbreg(FRAME_T4), db_alpha_regop },
+ { "t5", dbreg(FRAME_T5), db_alpha_regop },
+ { "t6", dbreg(FRAME_T6), db_alpha_regop },
+ { "t7", dbreg(FRAME_T7), db_alpha_regop },
+ { "s0", dbreg(FRAME_S0), db_alpha_regop },
Home |
Main Index |
Thread Index |
Old Index