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 (for UBC+NFS fixes, mostly).



details:   https://anonhg.NetBSD.org/src/rev/404f63ea0a48
branches:  thorpej_scsipi
changeset: 477368:404f63ea0a48
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Jan 18 09:22:04 2001 +0000

description:
Sync with head (for UBC+NFS fixes, mostly).

diffstat:

 sys/arch/Makefile                              |     6 +-
 sys/arch/alpha/a12/if_xb.c                     |    19 +-
 sys/arch/alpha/alpha/conf.c                    |    12 +-
 sys/arch/alpha/alpha/interrupt.c               |     9 +-
 sys/arch/alpha/alpha/mem.c                     |     6 +-
 sys/arch/alpha/alpha/pmap.c                    |     6 +-
 sys/arch/alpha/alpha/procfs_machdep.c          |    20 +
 sys/arch/alpha/conf/ALPHA                      |    12 +-
 sys/arch/alpha/conf/GENERIC                    |    12 +-
 sys/arch/alpha/conf/files.alpha                |     3 +-
 sys/arch/alpha/include/intr.h                  |     6 +-
 sys/arch/alpha/include/pio.h                   |     9 +-
 sys/arch/alpha/include/types.h                 |     3 +-
 sys/arch/amiga/amiga/amiga_init.c              |     9 +-
 sys/arch/amiga/amiga/conf.c                    |    11 +-
 sys/arch/amiga/amiga/machdep.c                 |    10 +-
 sys/arch/amiga/amiga/pmap.c                    |    29 +-
 sys/arch/amiga/amiga/procfs_machdep.c          |    20 +
 sys/arch/amiga/conf/Makefile.amiga             |     5 +-
 sys/arch/amiga/conf/files.amiga                |     3 +-
 sys/arch/amiga/dev/fd.c                        |     4 +-
 sys/arch/amiga/dev/ite.c                       |    24 +-
 sys/arch/amiga/dev/mfc.c                       |    22 +-
 sys/arch/amiga/dev/msc.c                       |    24 +-
 sys/arch/amiga/dev/ser.c                       |    22 +-
 sys/arch/amiga/include/intr.h                  |     3 +-
 sys/arch/amiga/include/mtpr.h                  |     4 +-
 sys/arch/amiga/include/psl.h                   |     5 +-
 sys/arch/amiga/include/types.h                 |     4 +-
 sys/arch/amigappc/include/intr.h               |     8 +-
 sys/arch/amigappc/include/types.h              |     4 +-
 sys/arch/arc/arc/arc_trap.c                    |     4 +-
 sys/arch/arc/arc/conf.c                        |    58 +-
 sys/arch/arc/arc/procfs_machdep.c              |    20 +
 sys/arch/arc/conf/files.arc                    |     3 +-
 sys/arch/arc/include/intr.h                    |     4 +-
 sys/arch/arc/include/pci_machdep.h             |    15 +-
 sys/arch/arc/pci/necpb.c                       |    13 +-
 sys/arch/arc/pci/pbcpcibus.c                   |    16 +-
 sys/arch/arm26/arm26/copyinout.S               |    54 +-
 sys/arch/arm26/arm26/db_disasm.c               |    76 -
 sys/arch/arm26/arm26/db_interface.c            |     4 +-
 sys/arch/arm26/arm26/db_machdep.c              |    13 +-
 sys/arch/arm26/arm26/except.c                  |     6 +-
 sys/arch/arm26/arm26/fpu.c                     |    54 +-
 sys/arch/arm26/arm26/fpu_asm.S                 |   162 ++
 sys/arch/arm26/arm26/genassym.cf               |     4 +-
 sys/arch/arm26/arm26/intrnames.S               |    98 -
 sys/arch/arm26/arm26/irq.c                     |    48 +-
 sys/arch/arm26/arm26/locore.S                  |    41 +-
 sys/arch/arm26/arm26/pmap.c                    |    10 +-
 sys/arch/arm26/arm26/procfs_machdep.c          |    20 +
 sys/arch/arm26/arm26/softintr.c                |    21 +-
 sys/arch/arm26/arm26/vm_machdep.c              |    39 +-
 sys/arch/arm26/conf/files.arm26                |    11 +-
 sys/arch/arm26/conf/std.arm26                  |     4 +-
 sys/arch/arm26/include/ansi.h                  |    95 +-
 sys/arch/arm26/include/aout_machdep.h          |    60 +-
 sys/arch/arm26/include/asm.h                   |   119 +-
 sys/arch/arm26/include/bswap.h                 |    10 +-
 sys/arch/arm26/include/cdefs.h                 |     9 +-
 sys/arch/arm26/include/disklabel.h             |    85 +-
 sys/arch/arm26/include/disklabel_acorn.h       |   122 +-
 sys/arch/arm26/include/elf_machdep.h           |    45 +-
 sys/arch/arm26/include/float.h                 |    90 +-
 sys/arch/arm26/include/fp.h                    |    87 +-
 sys/arch/arm26/include/frame.h                 |    12 +-
 sys/arch/arm26/include/ieee.h                  |   151 +--
 sys/arch/arm26/include/ieeefp.h                |    41 +-
 sys/arch/arm26/include/int_types.h             |    69 +-
 sys/arch/arm26/include/intr.h                  |     5 +-
 sys/arch/arm26/include/irq.h                   |    17 +-
 sys/arch/arm26/include/limits.h                |    98 +-
 sys/arch/arm26/include/lock.h                  |    52 +-
 sys/arch/arm26/include/math.h                  |    12 +-
 sys/arch/arm26/include/pcb.h                   |    13 +-
 sys/arch/arm26/include/setjmp.h                |    83 +-
 sys/arch/arm26/include/signal.h                |   137 +--
 sys/arch/arm26/include/stdarg.h                |    74 +-
 sys/arch/arm26/include/trap.h                  |    59 +-
 sys/arch/arm26/include/types.h                 |     4 +-
 sys/arch/arm26/include/varargs.h               |    64 +-
 sys/arch/arm26/iobus/ioc.c                     |   109 +-
 sys/arch/arm26/iobus/iocvar.h                  |    25 +-
 sys/arch/arm26/iobus/upc_iobus.c               |    12 +-
 sys/arch/arm26/ioc/arckbd.c                    |   169 +-
 sys/arch/arm26/podulebus/asc.c                 |     4 +-
 sys/arch/arm26/podulebus/if_ea.c               |     6 +-
 sys/arch/arm26/podulebus/if_eh.c               |    12 +-
 sys/arch/arm26/podulebus/if_ei.c               |     6 +-
 sys/arch/arm26/podulebus/podulebus.c           |    11 +-
 sys/arch/arm26/podulebus/podulebus.h           |     4 +-
 sys/arch/arm26/podulebus/podulebusreg.h        |    18 +-
 sys/arch/arm26/podulebus/unixbp.c              |     7 +-
 sys/arch/arm26/podulebus/unixbpvar.h           |     4 +-
 sys/arch/arm26/vidc/arcvideo.c                 |   104 +-
 sys/arch/arm26/vidc/vidcreg.h                  |    27 +-
 sys/arch/arm32/arm32/conf.c                    |    59 +-
 sys/arch/arm32/arm32/cpufunc.c                 |     4 +-
 sys/arch/arm32/arm32/db_disasm.c               |    75 -
 sys/arch/arm32/arm32/disassem.c                |   622 ----------
 sys/arch/arm32/arm32/disassem.h                |    48 -
 sys/arch/arm32/arm32/fault.c                   |     4 +-
 sys/arch/arm32/arm32/in_cksum_arm32.c          |   220 ---
 sys/arch/arm32/arm32/intr.c                    |     4 +-
 sys/arch/arm32/arm32/locore.S                  |    31 +-
 sys/arch/arm32/arm32/pmap.c                    |    20 +-
 sys/arch/arm32/arm32/procfs_machdep.c          |    20 +
 sys/arch/arm32/arm32/undefined.c               |     4 +-
 sys/arch/arm32/conf/CATS                       |     5 +-
 sys/arch/arm32/conf/files.arm32                |    11 +-
 sys/arch/arm32/conf/std.arm32                  |     4 +-
 sys/arch/arm32/include/Makefile                |     8 +-
 sys/arch/arm32/include/ansi.h                  |    95 +-
 sys/arch/arm32/include/aout_machdep.h          |    60 +-
 sys/arch/arm32/include/asm.h                   |   119 +-
 sys/arch/arm32/include/bswap.h                 |    10 +-
 sys/arch/arm32/include/cdefs.h                 |     9 +-
 sys/arch/arm32/include/disklabel.h             |    85 +-
 sys/arch/arm32/include/disklabel_acorn.h       |   122 +-
 sys/arch/arm32/include/elf_machdep.h           |     3 +
 sys/arch/arm32/include/float.h                 |    90 +-
 sys/arch/arm32/include/fp.h                    |    87 +-
 sys/arch/arm32/include/ieee.h                  |   151 +--
 sys/arch/arm32/include/ieeefp.h                |    41 +-
 sys/arch/arm32/include/int_types.h             |    69 +-
 sys/arch/arm32/include/limits.h                |    98 +-
 sys/arch/arm32/include/lock.h                  |    52 +-
 sys/arch/arm32/include/math.h                  |    12 +-
 sys/arch/arm32/include/psl.h                   |     3 +-
 sys/arch/arm32/include/setjmp.h                |    83 +-
 sys/arch/arm32/include/signal.h                |   158 +--
 sys/arch/arm32/include/stdarg.h                |    74 +-
 sys/arch/arm32/include/trap.h                  |    59 +-
 sys/arch/arm32/include/varargs.h               |    64 +-
 sys/arch/atari/atari/conf.c                    |    12 +-
 sys/arch/atari/atari/machdep.c                 |    13 +-
 sys/arch/atari/atari/pmap.c                    |    24 +-
 sys/arch/atari/atari/procfs_machdep.c          |    20 +
 sys/arch/atari/conf/files.atari                |     3 +-
 sys/arch/atari/dev/lpt.c                       |     4 +-
 sys/arch/atari/include/ahdilabel.h             |     6 +-
 sys/arch/atari/include/cpu.h                   |    11 +-
 sys/arch/atari/include/intr.h                  |     4 +-
 sys/arch/atari/isa/isa_machdep.c               |    21 +-
 sys/arch/atari/pci/pci_machdep.c               |     4 +-
 sys/arch/atari/stand/tostools/libtos/kparamb.h |     5 +-
 sys/arch/bebox/bebox/bus_dma.c                 |    10 +-
 sys/arch/bebox/bebox/conf.c                    |    59 +-
 sys/arch/bebox/bebox/extintr.c                 |     4 +-
 sys/arch/bebox/bebox/procfs_machdep.c          |    20 +
 sys/arch/bebox/conf/files.bebox                |     3 +-
 sys/arch/bebox/include/intr.h                  |     3 +-
 sys/arch/cobalt/cobalt/conf.c                  |    59 +-
 sys/arch/cobalt/cobalt/machdep.c               |     4 +-
 sys/arch/cobalt/cobalt/procfs_machdep.c        |    20 +
 sys/arch/cobalt/conf/files.cobalt              |     3 +-
 sys/arch/cobalt/include/intr.h                 |     3 +-
 sys/arch/evbsh3/conf/Makefile.evbsh3.inc       |     4 +-
 sys/arch/evbsh3/conf/files.evbsh3              |     3 +-
 sys/arch/evbsh3/evbsh3/machdep.c               |     4 +-
 sys/arch/evbsh3/evbsh3/procfs_machdep.c        |    20 +
 sys/arch/evbsh3/evbsh3/shb.c                   |     4 +-
 sys/arch/evbsh3/include/Makefile               |     4 +-
 sys/arch/evbsh3/include/mmeye.h                |    23 -
 sys/arch/hp300/conf/files.hp300                |     3 +-
 sys/arch/hp300/hp300/pmap.c                    |    28 +-
 sys/arch/hp300/hp300/procfs_machdep.c          |    20 +
 sys/arch/hp300/hp300/trap.c                    |     4 +-
 sys/arch/hp300/include/intr.h                  |     3 +-
 sys/arch/hpcmips/conf/TX3922                   |     5 +-
 sys/arch/hpcmips/conf/files.hpcmips            |     3 +-
 sys/arch/hpcmips/conf/std.hpcmips              |     4 +-
 sys/arch/hpcmips/dev/hpckbd.c                  |     7 +-
 sys/arch/hpcmips/dev/mq200reg.h                |    92 +-
 sys/arch/hpcmips/hpcmips/bus_space.c           |     6 +-
 sys/arch/hpcmips/hpcmips/clock.c               |     6 +-
 sys/arch/hpcmips/hpcmips/conf.c                |    58 +-
 sys/arch/hpcmips/hpcmips/machdep.c             |     6 +-
 sys/arch/hpcmips/hpcmips/procfs_machdep.c      |    20 +
 sys/arch/hpcmips/include/intr.h                |     4 +-
 sys/arch/hpcmips/vr/vrpiu.c                    |   101 +-
 sys/arch/hpcmips/vr/vrpiuvar.h                 |     3 +-
 sys/arch/i386/conf/CARDBUS                     |    21 +-
 sys/arch/i386/conf/GENERIC                     |    33 +-
 sys/arch/i386/conf/GENERIC_ISDN                |    27 +-
 sys/arch/i386/conf/GENERIC_LAPTOP              |     7 +-
 sys/arch/i386/conf/GENERIC_TINY                |     5 +-
 sys/arch/i386/conf/INSTALL                     |     5 +-
 sys/arch/i386/conf/IOPENER                     |     7 +-
 sys/arch/i386/conf/files.i386                  |     3 +-
 sys/arch/i386/i386/apm.c                       |    10 +-
 sys/arch/i386/i386/conf.c                      |    10 +-
 sys/arch/i386/i386/machdep.c                   |    11 +-
 sys/arch/i386/i386/pmap.c                      |    12 +-
 sys/arch/i386/i386/procfs_machdep.c            |   152 ++
 sys/arch/i386/i386/sys_machdep.c               |    15 +-
 sys/arch/i386/include/apmvar.h                 |     4 +-
 sys/arch/i386/include/intr.h                   |     3 +-
 sys/arch/i386/include/types.h                  |     3 +-
 sys/arch/i386/isa/isa_machdep.c                |    19 +-
 sys/arch/i386/isa/npx.c                        |    11 +-
 sys/arch/i386/pci/pci_intr_fixup.c             |     6 +-
 sys/arch/i386/pci/via82c586.c                  |     4 +-
 sys/arch/luna68k/conf/files.luna68k            |     3 +-
 sys/arch/luna68k/luna68k/pmap.c                |    28 +-
 sys/arch/luna68k/luna68k/procfs_machdep.c      |    20 +
 sys/arch/luna68k/luna68k/trap.c                |     6 +-
 sys/arch/m68k/fpe/fpu_calcea.c                 |    20 +-
 sys/arch/m68k/fpe/fpu_emulate.c                |    24 +-
 sys/arch/mac68k/conf/files.mac68k              |     3 +-
 sys/arch/mac68k/include/intr.h                 |     3 +-
 sys/arch/mac68k/mac68k/pmap.c                  |    28 +-
 sys/arch/mac68k/mac68k/procfs_machdep.c        |    20 +
 sys/arch/mac68k/mac68k/trap.c                  |     6 +-
 sys/arch/macppc/conf/GENERIC                   |     8 +-
 sys/arch/macppc/conf/files.macppc              |     3 +-
 sys/arch/macppc/include/intr.h                 |     3 +-
 sys/arch/macppc/macppc/conf.c                  |    57 +-
 sys/arch/macppc/macppc/extintr.c               |     4 +-
 sys/arch/macppc/macppc/procfs_machdep.c        |    20 +
 sys/arch/macppc/pci/pci_machdep.c              |    17 +-
 sys/arch/mips/conf/files.mips                  |     3 +-
 sys/arch/mips/include/cachectl.h               |     6 +-
 sys/arch/mips/include/cpu.h                    |    29 +-
 sys/arch/mips/include/proc.h                   |    10 +-
 sys/arch/mips/include/types.h                  |     5 +-
 sys/arch/mips/include/userret.h                |    55 +
 sys/arch/mips/mips/genassym.cf                 |     4 +-
 sys/arch/mips/mips/locore_mips1.S              |    55 +-
 sys/arch/mips/mips/locore_mips3.S              |    50 +-
 sys/arch/mips/mips/pmap.c                      |    20 +-
 sys/arch/mips/mips/sys_machdep.c               |     7 +-
 sys/arch/mips/mips/syscall.c                   |   381 ++++++
 sys/arch/mips/mips/trap.c                      |   197 +--
 sys/arch/mipsco/conf/files.mipsco              |     3 +-
 sys/arch/mipsco/include/intr.h                 |     5 +-
 sys/arch/mipsco/mipsco/machdep.c               |     6 +-
 sys/arch/mipsco/mipsco/procfs_machdep.c        |    20 +
 sys/arch/mmeye/conf/files.mmeye                |     3 +-
 sys/arch/mmeye/mmeye/procfs_machdep.c          |    20 +
 sys/arch/mmeye/mmeye/shb.c                     |     4 +-
 sys/arch/mvme68k/conf/files.mvme68k            |     3 +-
 sys/arch/mvme68k/include/intr.h                |     7 +-
 sys/arch/mvme68k/include/types.h               |     3 +-
 sys/arch/mvme68k/mvme68k/pmap.c                |    30 +-
 sys/arch/mvme68k/mvme68k/procfs_machdep.c      |    20 +
 sys/arch/mvme68k/mvme68k/softintr.c            |     6 +-
 sys/arch/mvme68k/mvme68k/vm_machdep.c          |    14 +-
 sys/arch/news68k/conf/files.news68k            |     3 +-
 sys/arch/news68k/include/db_machdep.h          |     5 +-
 sys/arch/news68k/include/intr.h                |     4 +-
 sys/arch/news68k/news68k/machdep.c             |    14 +-
 sys/arch/news68k/news68k/pmap.c                |    30 +-
 sys/arch/news68k/news68k/pmap_bootstrap.c      |    44 +-
 sys/arch/news68k/news68k/procfs_machdep.c      |    20 +
 sys/arch/news68k/stand/boot/Makefile           |     6 +-
 sys/arch/news68k/stand/bootxx/Makefile         |     6 +-
 sys/arch/newsmips/conf/files.newsmips          |     3 +-
 sys/arch/newsmips/include/intr.h               |     3 +-
 sys/arch/newsmips/newsmips/machdep.c           |     6 +-
 sys/arch/newsmips/newsmips/procfs_machdep.c    |    20 +
 sys/arch/next68k/conf/files.next68k            |     3 +-
 sys/arch/next68k/dev/mb8795.c                  |     8 +-
 sys/arch/next68k/include/intr.h                |     3 +-
 sys/arch/next68k/next68k/pmap.c                |    20 +-
 sys/arch/next68k/next68k/procfs_machdep.c      |    20 +
 sys/arch/next68k/next68k/trap.c                |     4 +-
 sys/arch/next68k/next68k/vm_machdep.c          |    14 +-
 sys/arch/ofppc/conf/files.ofppc                |     3 +-
 sys/arch/ofppc/include/cpu.h                   |     3 +-
 sys/arch/ofppc/ofppc/procfs_machdep.c          |    20 +
 sys/arch/ofppc/ofppc/soft_spl.c                |     4 +-
 sys/arch/pc532/conf/files.pc532                |     3 +-
 sys/arch/pc532/include/cpu.h                   |     3 +-
 sys/arch/pc532/include/psl.h                   |     3 +-
 sys/arch/pc532/pc532/machdep.c                 |    12 +-
 sys/arch/pc532/pc532/mainbus.c                 |     4 +-
 sys/arch/pc532/pc532/pmap.c                    |    12 +-
 sys/arch/pc532/pc532/procfs_machdep.c          |    20 +
 sys/arch/pmax/conf/files.pmax                  |     4 +-
 sys/arch/pmax/include/intr.h                   |     4 +-
 sys/arch/pmax/pmax/autoconf.c                  |    15 +-
 sys/arch/pmax/pmax/kadb.c                      |   817 -------------
 sys/arch/pmax/pmax/machdep.c                   |     6 +-
 sys/arch/pmax/pmax/procfs_machdep.c            |    20 +
 sys/arch/powerpc/powerpc/pmap.c                |    20 +-
 sys/arch/powerpc/powerpc/soft_spl.c            |     4 +-
 sys/arch/prep/conf/GENERIC                     |    18 +-
 sys/arch/prep/conf/INSTALL                     |   199 +++
 sys/arch/prep/conf/files.prep                  |     6 +-
 sys/arch/prep/include/intr.h                   |     3 +-
 sys/arch/prep/isa/isapnp_machdep.c             |   165 ++
 sys/arch/prep/prep/conf.c                      |    56 +-
 sys/arch/prep/prep/extintr.c                   |     4 +-
 sys/arch/prep/prep/procfs_machdep.c            |    20 +
 sys/arch/sgimips/conf/files.sgimips            |     3 +-
 sys/arch/sgimips/include/intr.h                |     3 +-
 sys/arch/sgimips/sgimips/conf.c                |    62 +-
 sys/arch/sgimips/sgimips/machdep.c             |     4 +-
 sys/arch/sgimips/sgimips/procfs_machdep.c      |    20 +
 sys/arch/sh3/conf/build-sh3.eb                 |     3 +-
 sys/arch/sh3/conf/build-sh3.el                 |     5 +-
 sys/arch/sh3/dev/sci.c                         |    14 +-
 sys/arch/sh3/dev/scif.c                        |    14 +-
 sys/arch/sh3/include/intr.h                    |     3 +-
 sys/arch/sh3/sh3/clock.c                       |    28 +-
 sys/arch/sh3/sh3/md_root.c                     |    76 +-
 sys/arch/sh3/sh3/pmap.c                        |    12 +-
 sys/arch/sparc/conf/files.sparc                |     3 +-
 sys/arch/sparc/include/psl.h                   |     4 +-
 sys/arch/sparc/sparc/conf.c                    |    58 +-
 sys/arch/sparc/sparc/intr.c                    |     4 +-
 sys/arch/sparc/sparc/pmap.c                    |    50 +-
 sys/arch/sparc/sparc/procfs_machdep.c          |    20 +
 sys/arch/sparc64/conf/files.sparc64            |     3 +-
 sys/arch/sparc64/dev/ebus.c                    |    17 +-
 sys/arch/sparc64/dev/pci_machdep.c             |     6 +-
 sys/arch/sparc64/include/cpu.h                 |     4 +-
 sys/arch/sparc64/include/intr.h                |     4 +-
 sys/arch/sparc64/include/psl.h                 |     6 +-
 sys/arch/sparc64/include/types.h               |     3 +-
 sys/arch/sparc64/sparc64/conf.c                |    58 +-
 sys/arch/sparc64/sparc64/intr.c                |    19 +-
 sys/arch/sparc64/sparc64/machdep.c             |   106 +-
 sys/arch/sparc64/sparc64/pmap.c                |    52 +-
 sys/arch/sparc64/sparc64/procfs_machdep.c      |    20 +
 sys/arch/sun3/conf/files.sun3                  |     3 +-
 sys/arch/sun3/include/psl.h                    |     5 +-
 sys/arch/sun3/sun3/dvma.c                      |     6 +-
 sys/arch/sun3/sun3/intreg.c                    |     4 +-
 sys/arch/sun3/sun3/pmap.c                      |    36 +-
 sys/arch/sun3/sun3/procfs_machdep.c            |    20 +
 sys/arch/sun3/sun3x/bus_subr.c                 |     6 +-
 sys/arch/sun3/sun3x/dvma.c                     |     6 +-
 sys/arch/sun3/sun3x/pmap.c                     |    24 +-
 sys/arch/vax/conf/files.vax                    |     3 +-
 sys/arch/vax/include/ansi.h                    |    33 +-
 sys/arch/vax/include/intr.h                    |     6 +-
 sys/arch/vax/include/types.h                   |     3 +-
 sys/arch/vax/vax/intvec.s                      |     5 +-
 sys/arch/vax/vax/machdep.c                     |     4 +-
 sys/arch/vax/vax/procfs_machdep.c              |    20 +
 sys/arch/vax/vax/unimpl_emul.s                 |   598 ++++++++-
 sys/arch/x68k/conf/files.x68k                  |     4 +-
 sys/arch/x68k/dev/rtclock.c                    |   115 +-
 sys/arch/x68k/dev/rtclock_var.h                |    17 +-
 sys/arch/x68k/include/intr.h                   |     6 +-
 sys/arch/x68k/include/param.h                  |     4 +-
 sys/arch/x68k/include/vmparam.h                |    20 +-
 sys/arch/x68k/stand/Makefile                   |     6 +-
 sys/arch/x68k/x68k/clock.c                     |     8 +-
 sys/arch/x68k/x68k/conf.c                      |    56 +-
 sys/arch/x68k/x68k/mem.c                       |    23 +-
 sys/arch/x68k/x68k/pmap.c                      |    32 +-
 sys/arch/x68k/x68k/pmap_bootstrap.c            |   109 +-
 sys/arch/x68k/x68k/procfs_machdep.c            |    20 +
 sys/arch/x68k/x68k/trap.c                      |     4 +-
 sys/compat/linux/arch/i386/linux_machdep.c     |     6 +-
 sys/compat/linux/arch/i386/linux_machdep.h     |     7 +-
 sys/compat/linux/common/linux_blkio.c          |   124 ++
 sys/compat/linux/common/linux_blkio.h          |    60 +
 sys/compat/linux/common/linux_ioctl.c          |     4 +-
 sys/compat/linux/common/linux_ioctl.h          |     4 +-
 sys/compat/linux/files.linux                   |     3 +-
 sys/compat/pecoff/pecoff_exec.c                |    28 +-
 sys/compat/ultrix/ultrix_misc.c                |    19 +-
 sys/conf/files                                 |     3 +-
 sys/dev/DEVNAMES                               |    14 +-
 sys/dev/ata/wd.c                               |    48 +-
 sys/dev/cardbus/cardbusdevs                    |     8 +-
 sys/dev/cardbus/cardbusdevs.h                  |    10 +-
 sys/dev/cardbus/cardbusdevs_data.h             |    22 +-
 sys/dev/cardbus/if_tlp_cardbus.c               |    55 +-
 sys/dev/ccd.c                                  |    56 +-
 sys/dev/ic/ac97.c                              |    21 +-
 sys/dev/ic/ac97var.h                           |     3 +-
 sys/dev/ic/cacreg.h                            |     5 +-
 sys/dev/ic/clmpcc.c                            |    12 +-
 sys/dev/ic/clmpccvar.h                         |     4 +-
 sys/dev/ic/com.c                               |    18 +-
 sys/dev/ic/comvar.h                            |     8 +-
 sys/dev/ic/hd64570.c                           |     3 +-
 sys/dev/ic/i4b_isic.c                          |   100 +-
 sys/dev/ic/i4b_isicl1.c                        |     4 +-
 sys/dev/ic/isp.c                               |   147 +-
 sys/dev/ic/isp_netbsd.c                        |    14 +-
 sys/dev/ic/ispmbox.h                           |    16 +-
 sys/dev/ic/ispvar.h                            |     9 +-
 sys/dev/ic/lptreg.h                            |    16 +-
 sys/dev/ic/rtl81x9.c                           |     5 +-
 sys/dev/ic/tulip.c                             |    59 +-
 sys/dev/ic/tulipvar.h                          |     3 +-
 sys/dev/ic/wdc.c                               |    19 +-
 sys/dev/ic/wdcvar.h                            |     3 +-
 sys/dev/isa/ess.c                              |     7 +-
 sys/dev/isa/essvar.h                           |     5 +-
 sys/dev/isa/fd.c                               |    32 +-
 sys/dev/isa/isa_isic.c                         |    24 +-
 sys/dev/isa/mcd.c                              |    41 +-
 sys/dev/ld.c                                   |    44 +-
 sys/dev/microcode/Makefile                     |     4 +-
 sys/dev/midi.c                                 |    82 +-
 sys/dev/midivar.h                              |     3 +-
 sys/dev/mii/miidevs                            |    10 +-
 sys/dev/mii/miidevs.h                          |    13 +-
 sys/dev/mii/miidevs_data.h                     |     5 +-
 sys/dev/mscp/mscp_disk.c                       |    49 +-
 sys/dev/ofisa/ess_ofisa.c                      |     9 +-
 sys/dev/ofw/ofdisk.c                           |    46 +-
 sys/dev/pci/cac_pci.c                          |    55 +-
 sys/dev/pci/cs4280.c                           |    27 +-
 sys/dev/pci/esm.c                              |  1466 ++++++++++++++++++++++++
 sys/dev/pci/esmreg.h                           |   352 +++++
 sys/dev/pci/esmvar.h                           |   174 ++
 sys/dev/pci/files.pci                          |     7 +-
 sys/dev/pci/i4b_avm_fritz_pci.c                |    19 +-
 sys/dev/pci/i4b_elsa_qs1p.c                    |    13 +-
 sys/dev/pci/if_lmc_nbsd.c                      |     5 +-
 sys/dev/pci/if_ti.c                            |     6 +-
 sys/dev/pci/if_tlp_pci.c                       |    11 +-
 sys/dev/pci/pccbb.c                            |     4 +-
 sys/dev/pci/pci_isic.c                         |    42 +-
 sys/dev/pci/pcidevs                            |    13 +-
 sys/dev/pci/pcidevs.h                          |    15 +-
 sys/dev/pci/pcidevs_data.h                     |    58 +-
 sys/dev/pci/pciide.c                           |    53 +-
 sys/dev/pci/pciide_apollo_reg.h                |     5 +-
 sys/dev/pci/siop_pci_common.c                  |    20 +-
 sys/dev/pci/twe.c                              |     6 +-
 sys/dev/pcmcia/if_wi.c                         |    16 +-
 sys/dev/pcmcia/if_wireg.h                      |     4 +-
 sys/dev/pcmcia/if_xi.c                         |     6 +-
 sys/dev/pcmcia/pcmcia_cis_quirks.c             |    78 +-
 sys/dev/pcmcia/pcmciadevs                      |    11 +-
 sys/dev/pcmcia/pcmciadevs.h                    |    19 +-
 sys/dev/pcmcia/pcmciadevs_data.h               |    39 +-
 sys/dev/pcmcia/wdc_pcmcia.c                    |     3 +-
 sys/dev/qbus/rl.c                              |    39 +-
 sys/dev/raidframe/rf_netbsdkintf.c             |    59 +-
 sys/dev/rasops/rasops_masks.c                  |     8 +-
 sys/dev/rasops/rasops_masks.h                  |     8 +-
 sys/dev/sbus/be.c                              |     4 +-
 sys/dev/sbus/p9100.c                           |     4 +-
 sys/dev/sbus/qe.c                              |     4 +-
 sys/dev/scsipi/cd.c                            |    41 +-
 sys/dev/scsipi/sd.c                            |    48 +-
 sys/dev/sun/cgsix.c                            |    40 +-
 sys/dev/sun/cgsixreg.h                         |     5 +-
 sys/dev/tc/cfb.c                               |   120 +-
 sys/dev/tc/files.tc                            |     7 +-
 sys/dev/tc/mfb.c                               |    96 +-
 sys/dev/tc/pxg.c                               |    75 +-
 sys/dev/tc/sfb.c                               |   262 +---
 sys/dev/tc/sfbplus.c                           |   771 +++++++++---
 sys/dev/tc/sfbptextops.c                       |    19 -
 sys/dev/tc/sfbptextops32.c                     |    19 -
 sys/dev/tc/sfbtextops.i                        |   681 -----------
 sys/dev/tc/stic.c                              |   328 ++---
 sys/dev/tc/sticvar.h                           |    48 +-
 sys/dev/tc/tfb.c                               |    92 +-
 sys/dev/usb/FILES                              |     8 +
 sys/dev/usb/files.usb                          |    44 +-
 sys/dev/usb/uaudio.c                           |     3 +-
 sys/dev/usb/ulpt.c                             |    14 +-
 sys/dev/usb/umass.c                            |    23 +-
 sys/dev/usb/umodem.c                           |    28 +-
 sys/dev/usb/usb_port.h                         |     4 +-
 sys/dev/usb/usb_quirks.c                       |     4 +-
 sys/dev/usb/usb_quirks.h                       |     3 +-
 sys/dev/usb/usb_subr.c                         |    20 +-
 sys/dev/usb/usbdevs                            |    13 +-
 sys/dev/usb/usbdevs.h                          |    15 +-
 sys/dev/usb/usbdevs_data.h                     |    36 +-
 sys/dev/usb/uscanner.c                         |     3 +-
 sys/dev/usb/usscanner.c                        |   745 ++++++++++++
 sys/dev/usb/uyap_firmware.h                    |  1236 ++++++++++++++++++++-
 sys/dev/vme/xd.c                               |    41 +-
 sys/dev/vme/xy.c                               |    38 +-
 sys/dev/vnd.c                                  |    58 +-
 sys/dev/wscons/wsconsio.h                      |     8 +-
 sys/gdbscripts/msgbuf                          |     8 +-
 sys/kern/init_sysent.c                         |     4 +-
 sys/kern/kern_clock.c                          |    24 +-
 sys/kern/kern_fork.c                           |    13 +-
 sys/kern/kern_ktrace.c                         |     9 +-
 sys/kern/kern_malloc.c                         |     6 +-
 sys/kern/kern_sig.c                            |    32 +-
 sys/kern/kern_subr.c                           |     4 +-
 sys/kern/kern_synch.c                          |     4 +-
 sys/kern/subr_pool.c                           |     6 +-
 sys/kern/sys_process.c                         |     6 +-
 sys/kern/syscalls.c                            |     4 +-
 sys/kern/syscalls.master                       |    43 +-
 sys/kern/uipc_mbuf.c                           |     4 +-
 sys/kern/vfs_subr.c                            |     4 +-
 sys/lkm/compat/Makefile.inc                    |     4 +-
 sys/lkm/compat/linux/Makefile                  |     4 +-
 sys/lkm/vfs/miscfs/procfs/Makefile             |     7 +-
 sys/miscfs/procfs/procfs.h                     |    30 +-
 sys/miscfs/procfs/procfs_fpregs.c              |     5 +-
 sys/miscfs/procfs/procfs_linux.c               |   126 ++
 sys/miscfs/procfs/procfs_map.c                 |     5 +-
 sys/miscfs/procfs/procfs_regs.c                |     5 +-
 sys/miscfs/procfs/procfs_subr.c                |     9 +-
 sys/miscfs/procfs/procfs_vfsops.c              |    15 +-
 sys/miscfs/procfs/procfs_vnops.c               |   112 +-
 sys/net/if.c                                   |   135 +-
 sys/net/if.h                                   |    11 +-
 sys/net/if_arcsubr.c                           |    12 +-
 sys/net/if_atmsubr.c                           |    30 +-
 sys/net/if_ethersubr.c                         |    38 +-
 sys/net/if_faith.c                             |     9 +-
 sys/net/if_fddisubr.c                          |    32 +-
 sys/net/if_gif.c                               |     3 +-
 sys/net/if_gre.c                               |     3 +-
 sys/net/if_hippisubr.c                         |    13 +-
 sys/net/if_ieee1394subr.c                      |    20 +-
 sys/net/if_loop.c                              |     7 +-
 sys/net/if_ppp.c                               |    78 +-
 sys/net/if_ppp.h                               |     3 +-
 sys/net/if_pppvar.h                            |     5 +-
 sys/net/if_sl.c                                |   819 +++++++-----
 sys/net/if_slvar.h                             |    10 +-
 sys/net/if_spppsubr.c                          |    23 +-
 sys/net/if_stf.c                               |    15 +-
 sys/net/if_strip.c                             |   817 ++++++------
 sys/net/if_stripvar.h                          |    11 +-
 sys/net/if_tokensubr.c                         |    13 +-
 sys/net/if_tun.c                               |     3 +-
 sys/net/if_vlan.c                              |     4 +-
 sys/net/netisr.h                               |    22 +-
 sys/net/netisr_dispatch.h                      |    10 +-
 sys/net/radix.c                                |     6 +-
 sys/net/route.c                                |   127 +-
 sys/net/route.h                                |     8 +-
 sys/net/rtsock.c                               |    24 +-
 sys/netccitt/if_x25subr.c                      |     6 +-
 sys/netccitt/pk_extern.h                       |     4 +-
 sys/netccitt/pk_llcsubr.c                      |    14 +-
 sys/netccitt/x25.h                             |     5 +-
 sys/netinet/if_arp.c                           |     6 +-
 sys/netinet/if_atm.c                           |     6 +-
 sys/netinet/if_atm.h                           |     4 +-
 sys/netinet/if_ieee1394arp.c                   |     4 +-
 sys/netinet/if_ieee1394arp.h                   |     4 +-
 sys/netinet/if_inarp.h                         |     4 +-
 sys/netinet/ip_ipip.c                          |     3 +-
 sys/netinet/ip_output.c                        |    48 +-
 sys/netinet/ip_var.h                           |     3 +-
 sys/netinet6/icmp6.c                           |     8 +-
 sys/netinet6/nd6.c                             |    10 +-
 sys/netinet6/nd6.h                             |     6 +-
 sys/netiso/eonvar.h                            |     4 +-
 sys/netiso/if_eon.c                            |    10 +-
 sys/netiso/iso_snpac.c                         |     8 +-
 sys/netiso/iso_var.h                           |     4 +-
 sys/netkey/key.c                               |    23 +-
 sys/netns/ns_ip.c                              |     3 +-
 sys/nfs/nfs_bio.c                              |     4 +-
 sys/sys/disklabel.h                            |    75 +-
 sys/sys/dkio.h                                 |    12 +-
 sys/sys/dvdio.h                                |     2 +
 sys/sys/ktrace.h                               |     3 +-
 sys/sys/malloc.h                               |    11 +-
 sys/sys/mbuf.h                                 |     6 +-
 sys/sys/signalvar.h                            |    11 +-
 sys/sys/sockio.h                               |    15 +-
 sys/sys/syscall.h                              |     4 +-
 sys/sys/syscallargs.h                          |     6 +-
 sys/sys/sysctl.h                               |    12 +-
 sys/sys/systm.h                                |     6 +-
 sys/ufs/ffs/ffs_softdep.c                      |    48 +-
 sys/ufs/ffs/ffs_softdep.stub.c                 |     2 +
 sys/ufs/ffs/ffs_vfsops.c                       |     5 +-
 sys/ufs/lfs/lfs_segment.c                      |     6 +-
 sys/ufs/ufs/inode.h                            |     4 +-
 sys/uvm/uvm_km.c                               |    20 +-
 sys/uvm/uvm_map.c                              |     6 +-
 sys/uvm/uvm_mmap.c                             |    17 +-
 sys/uvm/uvm_page.c                             |     8 +-
 sys/uvm/uvm_page_i.h                           |     6 +-
 sys/uvm/uvm_param.h                            |     4 +-
 sys/uvm/uvm_vnode.c                            |    20 +-
 584 files changed, 13898 insertions(+), 10246 deletions(-)

diffs (truncated from 40535 to 300 lines):

diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/Makefile
--- a/sys/arch/Makefile Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/Makefile Thu Jan 18 09:22:04 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5.8.2 2001/01/05 17:33:38 bouyer Exp $
+#      $NetBSD: Makefile,v 1.5.8.3 2001/01/18 09:22:04 bouyer Exp $
 
 # For now, we install the machine and arch includes, and symlink 'machine'
 # to the location of the machine includes.
@@ -6,8 +6,8 @@
 # Eventually, we should install everything.
 
 SUBDIR=        ${MACHINE}
-.if ${MACHINE} != ${MACHINE_ARCH}
-ARCHSUBDIR= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/sh3e[bl]/sh3/}
+ARCHSUBDIR= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/sh3e[bl]/sh3/:S/arm26/arm/:S/arm32/arm/}
+.if ${MACHINE} != ${ARCHSUBDIR}
 .if exists(${ARCHSUBDIR})
 SUBDIR+= ${ARCHSUBDIR}
 .endif
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/a12/if_xb.c
--- a/sys/arch/alpha/a12/if_xb.c        Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/alpha/a12/if_xb.c        Thu Jan 18 09:22:04 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xb.c,v 1.1.12.3 2000/12/13 15:49:14 bouyer Exp $ */
+/* $NetBSD: if_xb.c,v 1.1.12.4 2001/01/18 09:22:04 bouyer Exp $ */
 
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -74,7 +74,7 @@
 #include "opt_avalon_a12.h"            /* Config options headers */
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.1.12.3 2000/12/13 15:49:14 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.1.12.4 2001/01/18 09:22:04 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -234,7 +234,7 @@
        xbfound = 1;
        ccp = &xb_configuration;
        xb_init_config(ccp, 1);
-       printf(": driver %s mtu %d\n", "$Revision: 1.1.12.3 $", xbi.if_mtu);
+       printf(": driver %s mtu %d\n", "$Revision: 1.1.12.4 $", xbi.if_mtu);
 }
 
 static void
@@ -359,8 +359,8 @@
                xb_ibp   += 2;
                if (xb_intr_rcv_state == XBIR_PKTHDR) {
                        if (XB_DEBUG) {
-                               s = splimp();
-                               if (s != splimp())
+                               s = splnet();
+                               if (s != splnet())
                                        DIE();
                        }
                      ++xbi.if_ipackets;
@@ -430,7 +430,7 @@
        struct ifaddr *ifa = (struct ifaddr *)data;
        int s, error = 0;
 
-       s = splimp();
+       s = splnet();
        switch (cmd) {
        case SIOCSIFADDR:
                xbi.if_flags |= IFF_UP;
@@ -557,7 +557,7 @@
                xbh += 16;
        }
        bcopy(&xbo_framesize, xbh, 8);
-       s = splimp();
+       s = splnet();
        if (IF_QFULL(&ifp->if_snd)) {
                IF_DROP(&ifp->if_snd);
              ++ifp->if_oerrors;
@@ -766,8 +766,6 @@
        xbi.if_flags    = IFF_BROADCAST /* ha ha */
                        | IFF_SIMPLEX;
 
-       if_attach(&xbi);
-
        xbi.if_type     = IFT_A12MPPSWITCH;
        xbi.if_addrlen  = 32;
        xbi.if_hdrlen   = 32;
@@ -775,6 +773,9 @@
        xbi.if_output   = xb_output;
        /* xbi.if_broadcastaddr = (u_int8_t)&xbar_bc_addr; */
 
+       if_attach(&xbi);
+       if_alloc_sadl(&xbi);
+
 #if NBPFILTER > 0
        bpfattach(&xbi, DLT_NULL, 0);
 #endif
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/alpha/conf.c
--- a/sys/arch/alpha/alpha/conf.c       Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/alpha/alpha/conf.c       Thu Jan 18 09:22:04 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.41.2.3 2001/01/05 17:33:39 bouyer Exp $ */
+/* $NetBSD: conf.c,v 1.41.2.4 2001/01/18 09:22:05 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.3 2001/01/05 17:33:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.41.2.4 2001/01/18 09:22:05 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -214,14 +214,14 @@
        (dev_type_stop((*))) enodev, 0, seltrue, \
        (dev_type_mmap((*))) enodev }
 
-/* open, close, read, write */
+/* open, close, read, write, poll */
 #define        cdev_i4brbch_init(c,n) { \
        dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
-       dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \
+       dev_init(c,n,write), dev_init(c,n,ioctl), \
        (dev_type_stop((*))) enodev, \
        0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev }
 
-/* open, close, read, write */
+/* open, close, read, write, poll */
 #define        cdev_i4btel_init(c,n) { \
        dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
        dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \
@@ -235,7 +235,7 @@
        (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \
        (dev_type_mmap((*))) enodev }
 
-/* open, close, read, poll, ioctl */
+/* open, close, read, ioctl, poll */
 #define cdev_i4b_init(c,n) { \
        dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
        (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/alpha/interrupt.c
--- a/sys/arch/alpha/alpha/interrupt.c  Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/alpha/alpha/interrupt.c  Thu Jan 18 09:22:04 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.40.2.3 2000/12/08 09:23:22 bouyer Exp $ */
+/* $NetBSD: interrupt.c,v 1.40.2.4 2001/01/18 09:22:05 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.40.2.3 2000/12/08 09:23:22 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.40.2.4 2001/01/18 09:22:05 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -383,7 +383,7 @@
 struct alpha_soft_intr alpha_soft_intrs[IPL_NSOFT];
 
 /* XXX For legacy software interrupts. */
-struct alpha_soft_intrhand *softnet_intrhand, *softclock_intrhand;
+struct alpha_soft_intrhand *softnet_intrhand;
 
 /*
  * softintr_init:
@@ -409,11 +409,8 @@
        /* XXX Establish legacy software interrupt handlers. */
        softnet_intrhand = softintr_establish(IPL_SOFTNET,
            (void (*)(void *))netintr, NULL);
-       softclock_intrhand = softintr_establish(IPL_SOFTCLOCK,
-           (void (*)(void *))softclock, NULL);
 
        assert(softnet_intrhand != NULL);
-       assert(softclock_intrhand != NULL);
 }
 
 /*
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/alpha/mem.c
--- a/sys/arch/alpha/alpha/mem.c        Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/alpha/alpha/mem.c        Thu Jan 18 09:22:04 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.24.8.1 2000/11/20 19:56:35 bouyer Exp $ */
+/* $NetBSD: mem.c,v 1.24.8.2 2001/01/18 09:22:05 bouyer Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -46,7 +46,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.24.8.1 2000/11/20 19:56:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.24.8.2 2001/01/18 09:22:05 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -208,7 +208,7 @@
        /*
         * Allow access only in RAM.
         */
-       if ((prot & alpha_pa_access(atop(off))) != prot)
+       if ((prot & alpha_pa_access(off)) != prot)
                return (-1);
        return (alpha_btop(off));
 }
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/alpha/pmap.c
--- a/sys/arch/alpha/alpha/pmap.c       Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/alpha/alpha/pmap.c       Thu Jan 18 09:22:04 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.111.2.6 2001/01/05 17:33:40 bouyer Exp $ */
+/* $NetBSD: pmap.c,v 1.111.2.7 2001/01/18 09:22:05 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -154,7 +154,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.111.2.6 2001/01/05 17:33:40 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.111.2.7 2001/01/18 09:22:05 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -448,7 +448,7 @@
 
 #define        PSJQ_LOCK(pq, s)                                                \
 do {                                                                   \
-       s = splimp();                                                   \
+       s = splvm();                                                    \
        simple_lock(&(pq)->pq_slock);                                   \
 } while (0)
 
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/alpha/procfs_machdep.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/alpha/alpha/procfs_machdep.c     Thu Jan 18 09:22:04 2001 +0000
@@ -0,0 +1,20 @@
+/*     $NetBSD: procfs_machdep.c,v 1.1.2.2 2001/01/18 09:22:06 bouyer Exp $    */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mount.h>
+#include <sys/vnode.h>
+#include <miscfs/procfs/procfs.h>
+
+
+/*
+ * Linux-style /proc/cpuinfo.
+ * Only used when procfs is mounted with -o linux.
+ */
+int
+procfs_getcpuinfstr(char *buf, int *len)
+{
+       *len = 0;
+
+       return 0;
+}
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/alpha/conf/ALPHA Thu Jan 18 09:22:04 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: ALPHA,v 1.107.2.4 2001/01/05 17:33:43 bouyer Exp $
+# $NetBSD: ALPHA,v 1.107.2.5 2001/01/18 09:22:06 bouyer Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
 include        "arch/alpha/conf/std.alpha"
 
-ident          "ALPHA-$Revision: 1.107.2.4 $"
+ident          "ALPHA-$Revision: 1.107.2.5 $"
 
 maxusers 32
 
@@ -459,9 +459,17 @@
 cue*   at uhub? port ?         # CATC USB-EL1201A based adapters
 kue*   at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
 
+# Serial adapters
+# FTDI FT8U100AX serial adapter
+uftdi* at uhub? port ?
+ucom*  at uftdi? portno ?
+
 # USB scanners
 uscanner* at uhub? port ?
 
+# Y@P firmware loader
+uyap* at uhub? port ?
+
 # USB Generic driver
 ugen*  at uhub? port ?
 
diff -r 9d2715546d6c -r 404f63ea0a48 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Thu Jan 18 07:09:48 2001 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Thu Jan 18 09:22:04 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.130.2.4 2001/01/05 17:33:43 bouyer Exp $
+# $NetBSD: GENERIC,v 1.130.2.5 2001/01/18 09:22:06 bouyer Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 #




Home | Main Index | Thread Index | Old Index