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/2f7e7a6f4439
branches:  thorpej_scsipi
changeset: 477353:2f7e7a6f4439
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri Jan 05 17:33:37 2001 +0000

description:
Sync with HEAD

diffstat:

 sys/Makefile                                                    |      6 +-
 sys/altq/Makefile                                               |     12 +
 sys/altq/altq.h                                                 |    199 +
 sys/altq/altq_afmap.c                                           |    412 +
 sys/altq/altq_afmap.h                                           |    104 +
 sys/altq/altq_blue.c                                            |    691 +
 sys/altq/altq_blue.h                                            |    119 +
 sys/altq/altq_cbq.c                                             |    973 +
 sys/altq/altq_cbq.h                                             |    220 +
 sys/altq/altq_cdnr.c                                            |   1375 +
 sys/altq/altq_cdnr.h                                            |    334 +
 sys/altq/altq_classq.h                                          |    204 +
 sys/altq/altq_conf.c                                            |    459 +
 sys/altq/altq_conf.h                                            |    110 +
 sys/altq/altq_fifoq.c                                           |    415 +
 sys/altq/altq_fifoq.h                                           |     80 +
 sys/altq/altq_flowvalve.h                                       |     93 +
 sys/altq/altq_hfsc.c                                            |   1811 +
 sys/altq/altq_hfsc.h                                            |    279 +
 sys/altq/altq_localq.c                                          |     69 +
 sys/altq/altq_priq.c                                            |    866 +
 sys/altq/altq_priq.h                                            |    161 +
 sys/altq/altq_red.c                                             |   1475 +
 sys/altq/altq_red.h                                             |    190 +
 sys/altq/altq_rio.c                                             |    829 +
 sys/altq/altq_rio.h                                             |    140 +
 sys/altq/altq_rmclass.c                                         |   1871 +
 sys/altq/altq_rmclass.h                                         |    267 +
 sys/altq/altq_rmclass_debug.h                                   |    113 +
 sys/altq/altq_subr.c                                            |   1548 +
 sys/altq/altq_var.h                                             |    226 +
 sys/altq/altq_wfq.c                                             |    752 +
 sys/altq/altq_wfq.h                                             |    125 +
 sys/altq/altqconf.h                                             |     17 +
 sys/altq/if_altq.h                                              |    164 +
 sys/arch/Makefile                                               |      4 +-
 sys/arch/alpha/a12/if_ade.c                                     |      5 +-
 sys/arch/alpha/alpha/compat_13_machdep.c                        |      8 +-
 sys/arch/alpha/alpha/conf.c                                     |     18 +-
 sys/arch/alpha/alpha/dec_2100_a500.c                            |    360 +
 sys/arch/alpha/alpha/linux_syscall.c                            |    350 +
 sys/arch/alpha/alpha/machdep.c                                  |     33 +-
 sys/arch/alpha/alpha/osf1_locore.s                              |     87 -
 sys/arch/alpha/alpha/osf1_sigcode.s                             |     87 +
 sys/arch/alpha/alpha/osf1_syscall.c                             |     27 +-
 sys/arch/alpha/alpha/pmap.c                                     |      6 +-
 sys/arch/alpha/alpha/process_machdep.c                          |     28 +-
 sys/arch/alpha/alpha/prom.c                                     |     48 +-
 sys/arch/alpha/alpha/promcons.c                                 |     53 +-
 sys/arch/alpha/alpha/support.c                                  |     11 +-
 sys/arch/alpha/alpha/sys_machdep.c                              |     13 +-
 sys/arch/alpha/alpha/syscall.c                                  |     28 +-
 sys/arch/alpha/alpha/trap.c                                     |     99 +-
 sys/arch/alpha/alpha/vm_machdep.c                               |     41 +-
 sys/arch/alpha/common/bus_dma.c                                 |    147 +-
 sys/arch/alpha/common/comlogout.c                               |      9 +-
 sys/arch/alpha/common/sgmap_common.c                            |     64 +-
 sys/arch/alpha/common/sgmap_typedep.c                           |     49 +-
 sys/arch/alpha/common/sgmap_typedep.h                           |     24 +-
 sys/arch/alpha/common/sgmapvar.h                                |     16 +-
 sys/arch/alpha/conf/ALPHA                                       |     36 +-
 sys/arch/alpha/conf/ENIWETOK                                    |    450 -
 sys/arch/alpha/conf/GENERIC                                     |     36 +-
 sys/arch/alpha/conf/INSTALL                                     |     22 +-
 sys/arch/alpha/conf/Makefile.alpha                              |      8 +-
 sys/arch/alpha/conf/TCWSCONS                                    |      8 +-
 sys/arch/alpha/conf/files.alpha                                 |     10 +-
 sys/arch/alpha/include/ansi.h                                   |     17 +-
 sys/arch/alpha/include/int_types.h                              |      7 +-
 sys/arch/alpha/include/pci_machdep.h                            |      8 +-
 sys/arch/alpha/include/proc.h                                   |      6 +-
 sys/arch/alpha/include/sigdebug.h                               |     11 +
 sys/arch/alpha/include/types.h                                  |     19 +-
 sys/arch/alpha/include/userret.h                                |    119 +
 sys/arch/alpha/pci/apecs_dma.c                                  |     62 +-
 sys/arch/alpha/pci/cia_dma.c                                    |     62 +-
 sys/arch/alpha/pci/dwlpx_dma.c                                  |     62 +-
 sys/arch/alpha/pci/lca_dma.c                                    |     62 +-
 sys/arch/alpha/pci/mcpcia_dma.c                                 |     66 +-
 sys/arch/alpha/pci/pci_1000.c                                   |     17 +-
 sys/arch/alpha/pci/pci_1000a.c                                  |     17 +-
 sys/arch/alpha/pci/pci_2100_a50.c                               |     18 +-
 sys/arch/alpha/pci/pci_2100_a500.c                              |    854 +
 sys/arch/alpha/pci/pci_2100_a500.h                              |     43 +
 sys/arch/alpha/pci/pci_550.c                                    |     17 +-
 sys/arch/alpha/pci/pci_6600.c                                   |     17 +-
 sys/arch/alpha/pci/pci_alphabook1.c                             |     18 +-
 sys/arch/alpha/pci/pci_axppci_33.c                              |     18 +-
 sys/arch/alpha/pci/pci_eb164.c                                  |     18 +-
 sys/arch/alpha/pci/pci_eb64plus.c                               |     17 +-
 sys/arch/alpha/pci/pci_eb66.c                                   |     17 +-
 sys/arch/alpha/pci/pci_kn20aa.c                                 |     17 +-
 sys/arch/alpha/pci/pci_kn300.c                                  |     18 +-
 sys/arch/alpha/pci/pci_kn8ae.c                                  |     18 +-
 sys/arch/alpha/pci/pci_up1000.c                                 |     15 +-
 sys/arch/alpha/pci/sio_pic.c                                    |     28 +-
 sys/arch/alpha/pci/tsp_dma.c                                    |     60 +-
 sys/arch/alpha/pci/ttwoga.c                                     |    294 +
 sys/arch/alpha/pci/ttwoga_bus_io.c                              |     74 +
 sys/arch/alpha/pci/ttwoga_bus_mem.c                             |     88 +
 sys/arch/alpha/pci/ttwoga_dma.c                                 |    371 +
 sys/arch/alpha/pci/ttwoga_pci.c                                 |    248 +
 sys/arch/alpha/pci/ttwogareg.h                                  |    436 +
 sys/arch/alpha/pci/ttwogavar.h                                  |    112 +
 sys/arch/alpha/tc/tcasic.c                                      |     66 +-
 sys/arch/amiga/amiga/conf.c                                     |     55 +-
 sys/arch/amiga/amiga/sys_machdep.c                              |     60 +-
 sys/arch/amiga/amiga/trap.c                                     |    246 +-
 sys/arch/amiga/conf/AMIGA                                       |     10 +-
 sys/arch/amiga/conf/DRACO                                       |     10 +-
 sys/arch/amiga/conf/GENERIC                                     |      8 +-
 sys/arch/amiga/conf/INSTALL                                     |     12 +-
 sys/arch/amiga/conf/Makefile.amiga                              |      8 +-
 sys/arch/amiga/dev/if_ne_zbus.c                                 |      4 +-
 sys/arch/amiga/include/cpu.h                                    |      7 +-
 sys/arch/amigappc/conf/Makefile.amigappc                        |      6 -
 sys/arch/amigappc/include/cpu.h                                 |      2 +
 sys/arch/arc/Makefile                                           |      6 +-
 sys/arch/arc/algor/com_algor.c                                  |    154 +
 sys/arch/arc/algor/lpt_algor.c                                  |    186 +
 sys/arch/arc/arc/arc_trap.c                                     |      6 +-
 sys/arch/arc/arc/clock.c                                        |     32 +-
 sys/arch/arc/arc/clock_mc.c                                     |      6 +-
 sys/arch/arc/arc/machdep.c                                      |      6 +-
 sys/arch/arc/arc/mainbus.c                                      |      4 +-
 sys/arch/arc/conf/GENERIC                                       |     33 +-
 sys/arch/arc/conf/M403                                          |     30 +-
 sys/arch/arc/conf/MIMORI                                        |     28 +-
 sys/arch/arc/conf/PCCONS                                        |     26 +-
 sys/arch/arc/conf/PICA                                          |     30 +-
 sys/arch/arc/conf/RAMDISK                                       |     30 +-
 sys/arch/arc/conf/files.arc                                     |     73 +-
 sys/arch/arc/dev/asc.c                                          |   2111 --
 sys/arch/arc/dev/ascreg.h                                       |    338 -
 sys/arch/arc/dev/com_lbus.c                                     |    159 -
 sys/arch/arc/dev/dma.c                                          |    323 -
 sys/arch/arc/dev/dma.h                                          |    123 -
 sys/arch/arc/dev/fd.c                                           |   1207 -
 sys/arch/arc/dev/fdreg.h                                        |     68 -
 sys/arch/arc/dev/if_sn.c                                        |   1286 -
 sys/arch/arc/dev/if_snreg.h                                     |    349 -
 sys/arch/arc/dev/lpt_lbus.c                                     |    190 -
 sys/arch/arc/dev/md_root.c                                      |     84 -
 sys/arch/arc/dev/pccons.c                                       |     15 +-
 sys/arch/arc/dev/scsi.h                                         |    551 -
 sys/arch/arc/isa/isabus.c                                       |      6 +-
 sys/arch/arc/jazz/asc.c                                         |   2112 ++
 sys/arch/arc/jazz/ascreg.h                                      |    338 +
 sys/arch/arc/jazz/clock_jazzio.c                                |    142 +
 sys/arch/arc/jazz/com_jazzio.c                                  |    155 +
 sys/arch/arc/jazz/dma.c                                         |    305 +
 sys/arch/arc/jazz/dma.h                                         |    117 +
 sys/arch/arc/jazz/fd.c                                          |   1208 +
 sys/arch/arc/jazz/fdreg.h                                       |     68 +
 sys/arch/arc/jazz/if_sn.c                                       |   1286 +
 sys/arch/arc/jazz/if_snreg.h                                    |    349 +
 sys/arch/arc/jazz/jazzdmatlb.c                                  |      3 +-
 sys/arch/arc/jazz/jazzio.c                                      |    437 +
 sys/arch/arc/jazz/jazziovar.h                                   |     19 +
 sys/arch/arc/jazz/lpt_jazzio.c                                  |    196 +
 sys/arch/arc/jazz/pckbc_jazzio.c                                |     33 +-
 sys/arch/arc/jazz/pica.h                                        |    155 +
 sys/arch/arc/jazz/rd94.h                                        |    112 +
 sys/arch/arc/jazz/scsi.h                                        |    551 +
 sys/arch/arc/jazz/vga_jazzio.c                                  |      9 +-
 sys/arch/arc/pci/necpb.c                                        |      4 +-
 sys/arch/arc/pica/pica.h                                        |    155 -
 sys/arch/arc/pica/picabus.c                                     |    453 -
 sys/arch/arc/pica/rd94.h                                        |    112 -
 sys/arch/arm26/arm26/aout_machdep.c                             |    105 -
 sys/arch/arm26/arm26/copyinout.S                                |     22 +-
 sys/arch/arm26/arm26/cpu.c                                      |     16 +-
 sys/arch/arm26/arm26/db_interface.c                             |     12 +-
 sys/arch/arm26/arm26/db_machdep.c                               |    178 +-
 sys/arch/arm26/arm26/except.c                                   |    184 +-
 sys/arch/arm26/arm26/fpu.c                                      |    119 +
 sys/arch/arm26/arm26/locore.S                                   |     28 +-
 sys/arch/arm26/arm26/md_root.c                                  |     88 -
 sys/arch/arm26/arm26/pmap.c                                     |    370 +-
 sys/arch/arm26/arm26/start.c                                    |     39 +-
 sys/arch/arm26/arm26/vm_machdep.c                               |     59 +-
 sys/arch/arm26/conf/FOURMEG                                     |     10 +-
 sys/arch/arm26/conf/GENERIC                                     |     11 +-
 sys/arch/arm26/conf/Makefile.arm26                              |      8 +-
 sys/arch/arm26/conf/files.arm26                                 |     18 +-
 sys/arch/arm26/include/ansi.h                                   |     23 +-
 sys/arch/arm26/include/aout_machdep.h                           |     66 +-
 sys/arch/arm26/include/asm.h                                    |     43 +-
 sys/arch/arm26/include/cdefs.h                                  |      9 +-
 sys/arch/arm26/include/float.h                                  |     14 +-
 sys/arch/arm26/include/fpureg.h                                 |     61 +
 sys/arch/arm26/include/int_types.h                              |     13 +-
 sys/arch/arm26/include/param.h                                  |      5 +-
 sys/arch/arm26/include/pmap.h                                   |      4 +-
 sys/arch/arm26/include/setjmp.h                                 |      5 +-
 sys/arch/arm26/include/stdarg.h                                 |     29 +-
 sys/arch/arm26/include/types.h                                  |     21 +-
 sys/arch/arm26/include/varargs.h                                |     31 +-
 sys/arch/arm26/include/vmparam.h                                |      4 +-
 sys/arch/arm26/iobus/ioc.c                                      |     15 +-
 sys/arch/arm26/ioc/arckbd.c                                     |     14 +-
 sys/arch/arm26/podulebus/if_eh.c                                |    245 +-
 sys/arch/arm26/podulebus/if_ehreg.h                             |     44 +-
 sys/arch/arm26/podulebus/if_ei.c                                |     10 +-
 sys/arch/arm26/podulebus/podloader_asm.S                        |     61 +
 sys/arch/arm26/podulebus/podulebus.c                            |    146 +-
 sys/arch/arm26/podulebus/podulebus.h                            |      9 +-
 sys/arch/arm26/vidc/arcvideo.c                                  |     26 +-
 sys/arch/arm32/arm32/compat_13_machdep.c                        |      6 +-
 sys/arch/arm32/arm32/machdep.c                                  |     21 +-
 sys/arch/arm32/conf/GENERIC                                     |      5 +-
 sys/arch/arm32/conf/Makefile.arm32                              |      8 +-
 sys/arch/arm32/footbridge/footbridge_pci.c                      |     13 +-
 sys/arch/arm32/include/ansi.h                                   |     17 +-
 sys/arch/arm32/include/asm.h                                    |      8 +-
 sys/arch/arm32/include/int_types.h                              |      7 +-
 sys/arch/arm32/include/pci_machdep.h                            |      6 +-
 sys/arch/arm32/include/types.h                                  |     21 +-
 sys/arch/arm32/podulebus/podule_data.h                          |      9 +-
 sys/arch/arm32/podulebus/podules                                |      7 +-
 sys/arch/arm32/podulebus/podules.h                              |      9 +-
 sys/arch/arm32/vidc/console/console.c                           |      4 +-
 sys/arch/arm32/vidc/console/vt220.c                             |      4 +-
 sys/arch/atari/atari/conf.c                                     |     25 +-
 sys/arch/atari/atari/sys_machdep.c                              |     60 +-
 sys/arch/atari/atari/trap.c                                     |    248 +-
 sys/arch/atari/conf/GENERIC                                     |      6 +-
 sys/arch/atari/conf/Makefile.atari                              |      8 +-
 sys/arch/atari/include/cpu.h                                    |      7 +-
 sys/arch/atari/include/pci_machdep.h                            |     11 +-
 sys/arch/atari/pci/pci_machdep.c                                |     10 +-
 sys/arch/bebox/conf/GENERIC                                     |      5 +-
 sys/arch/bebox/conf/Makefile.bebox                              |      8 +-
 sys/arch/bebox/include/cpu.h                                    |      4 +-
 sys/arch/bebox/include/pci_machdep.h                            |     10 +-
 sys/arch/bebox/pci/pci_machdep.c                                |     10 +-
 sys/arch/cobalt/conf/GENERIC                                    |      5 +-
 sys/arch/cobalt/include/pci_machdep.h                           |     10 +-
 sys/arch/cobalt/pci/pci_machdep.c                               |     12 +-
 sys/arch/evbsh3/conf/COMPUTEX7750                               |     10 +-
 sys/arch/evbsh3/conf/COMPUTEXEVB                                |     10 +-
 sys/arch/evbsh3/conf/CQREEKSH3                                  |     10 +-
 sys/arch/evbsh3/conf/DREAMCAST                                  |    140 -
 sys/arch/evbsh3/conf/KZSH401                                    |     10 +-
 sys/arch/evbsh3/conf/Makefile.evbsh3                            |    221 -
 sys/arch/evbsh3/conf/Makefile.evbsh3.inc                        |      3 +
 sys/arch/evbsh3/conf/std.evbsh3                                 |      7 -
 sys/arch/evbsh3/conf/std.evbsh3.eb                              |     11 +
 sys/arch/evbsh3/conf/std.evbsh3.el                              |     11 +
 sys/arch/evbsh3/include/endian_machdep.h                        |      9 +-
 sys/arch/evbsh3/include/param.h                                 |     18 +-
 sys/arch/hp300/conf/BASALT                                      |      3 +-
 sys/arch/hp300/conf/DUALITY                                     |    164 -
 sys/arch/hp300/conf/GENERIC                                     |      8 +-
 sys/arch/hp300/conf/Makefile.hp300                              |      8 +-
 sys/arch/hp300/conf/files.hp300                                 |      5 +-
 sys/arch/hp300/conf/std.hp300                                   |      3 +-
 sys/arch/hp300/hp300/hpux_machdep.c                             |     25 +-
 sys/arch/hp300/hp300/machdep.c                                  |     12 +-
 sys/arch/hp300/hp300/sys_machdep.c                              |     61 +-
 sys/arch/hp300/hp300/trap.c                                     |    241 +-
 sys/arch/hp300/include/cpu.h                                    |      5 +-
 sys/arch/hp300/include/db_machdep.h                             |      6 +-
 sys/arch/hp300/include/loadfile_machdep.h                       |     60 +-
 sys/arch/hp300/stand/Makefile.buildboot                         |     57 +-
 sys/arch/hp300/stand/Makefile.inc                               |     39 +-
 sys/arch/hp300/stand/common/conf.c                              |      4 +-
 sys/arch/hp300/stand/common/machdep.c                           |      3 +-
 sys/arch/hp300/stand/common/newvers.sh                          |     44 -
 sys/arch/hp300/stand/common/samachdep.h                         |      6 +-
 sys/arch/hp300/stand/mkboot/Makefile                            |     12 +-
 sys/arch/hp300/stand/mkboot/mkboot.c                            |    256 +-
 sys/arch/hp300/stand/uboot/uboot.c                              |     40 +-
 sys/arch/hp300/stand/uboot/version                              |      3 +-
 sys/arch/hpcmips/conf/GENERIC                                   |     13 +-
 sys/arch/hpcmips/conf/MURUROA                                   |    273 -
 sys/arch/hpcmips/conf/Makefile.hpcmips                          |    243 -
 sys/arch/hpcmips/conf/Makefile.hpcmips.inc                      |      4 +
 sys/arch/hpcmips/conf/TX3912                                    |     10 +-
 sys/arch/hpcmips/conf/TX3922                                    |     14 +-
 sys/arch/hpcmips/conf/std.hpcmips                               |      6 +-
 sys/arch/hpcmips/dev/apm/apmdev.c                               |      6 +-
 sys/arch/hpcmips/dev/bivideo.c                                  |     19 +-
 sys/arch/hpcmips/dev/hpcapm.c                                   |    147 +-
 sys/arch/hpcmips/dev/hpcfb.c                                    |    175 +-
 sys/arch/hpcmips/dev/hpcfbvar.h                                 |      4 +-
 sys/arch/hpcmips/dev/mq200.c                                    |     39 +-
 sys/arch/hpcmips/hpcmips/platid.c                               |     14 +-
 sys/arch/hpcmips/hpcmips/platid_mask.c                          |      2 +-
 sys/arch/hpcmips/hpcmips/platid_name.c                          |      2 +-
 sys/arch/hpcmips/hpcmips/platid_test.c                          |     43 +-
 sys/arch/hpcmips/include/config_hook.h                          |    248 +-
 sys/arch/hpcmips/include/platid.h                               |      8 +-
 sys/arch/hpcmips/include/platid_generated.h                     |      2 +-
 sys/arch/hpcmips/include/platid_mask.h                          |      2 +-
 sys/arch/hpcmips/stand/Makefile                                 |     19 +-
 sys/arch/hpcmips/stand/dspgen/application_WCE_MIPS.tmpl.evc3    |    104 +
 sys/arch/hpcmips/stand/dspgen/config.sh                         |     49 +
 sys/arch/hpcmips/stand/dspgen/do_subst.sh                       |     16 +-
 sys/arch/hpcmips/stand/dspgen/gen_workspace.sh                  |     23 +-
 sys/arch/hpcmips/stand/dspgen/static_library_WCE_MIPS.tmpl.evc3 |     83 +
 sys/arch/hpcmips/stand/include/mips/int_types.h                 |     79 +-
 sys/arch/hpcmips/stand/include/mips/types.h                     |    100 +-
 sys/arch/hpcmips/stand/libsa/libsa.config                       |      7 +-
 sys/arch/hpcmips/stand/libsa/libsa.dsp                          |      4 +-
 sys/arch/hpcmips/stand/libz/libz.config                         |      7 +-
 sys/arch/hpcmips/stand/libz/libz.dsp                            |      4 +-
 sys/arch/hpcmips/stand/pbsdboot/main.c                          |      4 +-
 sys/arch/hpcmips/stand/pbsdboot/pbsdboot.config                 |      6 +-
 sys/arch/hpcmips/stand/pbsdboot/pbsdboot.dsp                    |      4 +-
 sys/arch/hpcmips/stand/pbsdboot/pbsdboot.uu                     |   7331 +++---
 sys/arch/hpcmips/stand/pbsdboot/pbsdboot1.uu                    |   7994 +++---
 sys/arch/hpcmips/tx/txcom.c                                     |     10 +-
 sys/arch/hpcmips/vr/vrc4172pwm.c                                |    267 +-
 sys/arch/hpcmips/vr/vrc4172pwmreg.h                             |      4 +-
 sys/arch/hpcmips/vr/vrc4172pwmvar.h                             |     16 +-
 sys/arch/hpcmips/vr/vrc4172reg.h                                |      4 +-
 sys/arch/hpcmips/vr/vrgiu.c                                     |     12 +-
 sys/arch/hpcmips/vr/vrled.c                                     |     28 +-
 sys/arch/hpcmips/vr/vrpiu.c                                     |      6 +-
 sys/arch/i386/conf/BOAT_ANCHOR                                  |     73 -
 sys/arch/i386/conf/GENERIC                                      |      7 +-
 sys/arch/i386/conf/GENERIC_ISDN                                 |     81 +
 sys/arch/i386/conf/GENERIC_LAPTOP                               |      5 +-
 sys/arch/i386/conf/KICKME                                       |    105 -
 sys/arch/i386/conf/Makefile.i386                                |      8 +-
 sys/arch/i386/conf/SUN_LAMP                                     |    174 -
 sys/arch/i386/conf/ZHADUM                                       |    513 -
 sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS                     |    777 -
 sys/arch/i386/conf/files.i386                                   |      3 +-
 sys/arch/i386/i386/compat_13_machdep.c                          |      6 +-
 sys/arch/i386/i386/conf.c                                       |     21 +-
 sys/arch/i386/i386/freebsd_machdep.c                            |     21 +-
 sys/arch/i386/i386/freebsd_syscall.c                            |    258 +
 sys/arch/i386/i386/ibcs2_machdep.c                              |     17 +-
 sys/arch/i386/i386/linux_syscall.c                              |      7 +-
 sys/arch/i386/i386/machdep.c                                    |     29 +-
 sys/arch/i386/i386/pmap.c                                       |    770 +-
 sys/arch/i386/i386/svr4_machdep.c                               |     15 +-
 sys/arch/i386/i386/syscall.c                                    |      2 +-
 sys/arch/i386/i386/vm86.c                                       |      6 +-
 sys/arch/i386/i386/vm_machdep.c                                 |      4 +-
 sys/arch/i386/include/ansi.h                                    |     17 +-
 sys/arch/i386/include/asm.h                                     |      4 +-
 sys/arch/i386/include/disklabel.h                               |     24 +-
 sys/arch/i386/include/freebsd_machdep.h                         |      3 +-
 sys/arch/i386/include/int_types.h                               |      7 +-
 sys/arch/i386/include/pci_machdep.h                             |      6 +-
 sys/arch/i386/include/pmap.h                                    |     24 +-
 sys/arch/i386/include/specialreg.h                              |     11 +-
 sys/arch/i386/include/types.h                                   |     21 +-
 sys/arch/i386/include/vmparam.h                                 |      4 +-
 sys/arch/i386/pci/pchb_rnd.c                                    |     14 +-
 sys/arch/i386/pci/pci_machdep.c                                 |     10 +-
 sys/arch/i386/pnpbios/fdc_pnpbios.c                             |     78 +-
 sys/arch/i386/pnpbios/pnpbios.c                                 |     22 +-
 sys/arch/i386/pnpbios/pnpbiosvar.h                              |      3 +-
 sys/arch/luna68k/conf/GENERIC                                   |      7 +-
 sys/arch/luna68k/conf/Makefile.luna68k                          |      8 +-
 sys/arch/luna68k/include/cpu.h                                  |      4 +-
 sys/arch/luna68k/luna68k/sys_machdep.c                          |     63 +-
 sys/arch/luna68k/luna68k/trap.c                                 |    209 +-
 sys/arch/m68k/conf/files.m68k                                   |      3 +-
 sys/arch/m68k/include/ansi.h                                    |     17 +-
 sys/arch/m68k/include/cpu.h                                     |     10 +-
 sys/arch/m68k/include/int_types.h                               |      7 +-
 sys/arch/m68k/include/types.h                                   |     21 +-
 sys/arch/m68k/m68k/compat_13_machdep.c                          |      6 +-
 sys/arch/m68k/m68k/m68k_syscall.c                               |    347 +
 sys/arch/m68k/m68k/sig_machdep.c                                |     21 +-
 sys/arch/m68k/m68k/sunos_machdep.c                              |     27 +-
 sys/arch/m68k/m68k/svr4_machdep.c                               |     15 +-
 sys/arch/mac68k/conf/GENERIC                                    |      5 +-
 sys/arch/mac68k/conf/Makefile.mac68k                            |      8 +-
 sys/arch/mac68k/include/cpu.h                                   |      5 +-
 sys/arch/mac68k/mac68k/locore.s                                 |      7 +-
 sys/arch/mac68k/mac68k/sys_machdep.c                            |     61 +-
 sys/arch/mac68k/mac68k/trap.c                                   |    246 +-
 sys/arch/mac68k/obio/esp.c                                      |    339 +-
 sys/arch/mac68k/obio/espvar.h                                   |      5 +-
 sys/arch/macppc/conf/GENERIC                                    |     11 +-
 sys/arch/macppc/conf/INSTALL                                    |      5 +-
 sys/arch/macppc/conf/Makefile.macppc                            |     10 +-
 sys/arch/macppc/dev/adb.c                                       |     22 +-
 sys/arch/macppc/dev/adb_direct.c                                |     42 +-
 sys/arch/macppc/dev/adbvar.h                                    |     28 +-
 sys/arch/macppc/dev/akbd.c                                      |     68 +-
 sys/arch/macppc/dev/ams.c                                       |    212 +-
 sys/arch/macppc/dev/if_gm.c                                     |      5 +-
 sys/arch/macppc/dev/mesh.c                                      |      9 +-
 sys/arch/macppc/include/adbsys.h                                |      3 +-
 sys/arch/macppc/include/bus.h                                   |     16 +-
 sys/arch/macppc/include/cpu.h                                   |     25 +-
 sys/arch/macppc/include/pci_machdep.h                           |     10 +-
 sys/arch/macppc/macppc/clock.c                                  |     14 +-
 sys/arch/macppc/macppc/extintr.c                                |     49 +-
 sys/arch/macppc/macppc/genassym.cf                              |     12 +-
 sys/arch/macppc/macppc/locore.S                                 |     61 +-
 sys/arch/macppc/macppc/machdep.c                                |      4 +-
 sys/arch/macppc/pci/pci_machdep.c                               |     10 +-
 sys/arch/mips/conf/Makefile.mips                                |     11 +-
 sys/arch/mips/include/ansi.h                                    |     17 +-
 sys/arch/mips/include/asm.h                                     |      7 +-
 sys/arch/mips/include/int_types.h                               |      7 +-
 sys/arch/mips/include/pmap.h                                    |     10 +-
 sys/arch/mips/include/types.h                                   |     21 +-
 sys/arch/mips/mips/compat_13_machdep.c                          |      8 +-
 sys/arch/mips/mips/locore.S                                     |      9 +-
 sys/arch/mips/mips/locore_mips3.S                               |     50 +-
 sys/arch/mips/mips/mips_machdep.c                               |     50 +-
 sys/arch/mips/mips/pmap.c                                       |      6 +-
 sys/arch/mips/mips/process_machdep.c                            |     13 +-
 sys/arch/mips/mips/sys_machdep.c                                |     81 +-
 sys/arch/mips/mips/trap.c                                       |     12 +-
 sys/arch/mipsco/conf/GENERIC                                    |      3 +-
 sys/arch/mmeye/conf/GENERIC                                     |      7 +-
 sys/arch/mmeye/conf/Makefile.mmeye                              |    225 -
 sys/arch/mmeye/conf/Makefile.mmeye.inc                          |      9 +
 sys/arch/mmeye/conf/std.mmeye                                   |      5 +-
 sys/arch/mmeye/include/param.h                                  |      8 +-
 sys/arch/mvme68k/conf/GENERIC                                   |      5 +-
 sys/arch/mvme68k/conf/Makefile.mvme68k                          |      8 +-
 sys/arch/mvme68k/include/param.h                                |      4 +-
 sys/arch/mvme68k/mvme68k/bus_dma.c                              |      8 +-
 sys/arch/mvme68k/mvme68k/locore.s                               |      5 +-
 sys/arch/mvme68k/mvme68k/pmap.c                                 |     21 +-
 sys/arch/mvme68k/mvme68k/sys_machdep.c                          |     79 +-
 sys/arch/mvme68k/mvme68k/trap.c                                 |    320 +-
 sys/arch/mvme68k/stand/sboot/Makefile                           |      4 +-
 sys/arch/news68k/conf/GENERIC                                   |      5 +-
 sys/arch/news68k/conf/Makefile.news68k                          |      8 +-
 sys/arch/news68k/include/cpu.h                                  |      5 +-
 sys/arch/news68k/news68k/locore.s                               |      4 +-
 sys/arch/news68k/news68k/sys_machdep.c                          |     61 +-
 sys/arch/news68k/news68k/trap.c                                 |    242 +-
 sys/arch/newsmips/conf/GENERIC                                  |      5 +-
 sys/arch/next68k/conf/GENERIC                                   |      6 +-
 sys/arch/next68k/conf/Makefile.next68k                          |      8 +-
 sys/arch/next68k/dev/bus_dma.c                                  |      8 +-
 sys/arch/next68k/include/cpu.h                                  |      5 +-
 sys/arch/next68k/next68k/sys_machdep.c                          |     61 +-
 sys/arch/next68k/next68k/trap.c                                 |    241 +-
 sys/arch/ofppc/conf/GENERIC                                     |      5 +-
 sys/arch/ofppc/conf/Makefile.ofppc                              |     10 +-
 sys/arch/ofppc/include/cpu.h                                    |      4 +-
 sys/arch/pc532/conf/GENERIC                                     |      5 +-
 sys/arch/pc532/conf/Makefile.pc532                              |      8 +-
 sys/arch/pc532/dev/scn.c                                        |     16 +-
 sys/arch/pc532/include/ansi.h                                   |     17 +-
 sys/arch/pc532/include/int_types.h                              |      7 +-
 sys/arch/pc532/include/psl.h                                    |      6 +-
 sys/arch/pc532/include/types.h                                  |     21 +-
 sys/arch/pc532/pc532/compat_13_machdep.c                        |      6 +-
 sys/arch/pc532/pc532/machdep.c                                  |     21 +-
 sys/arch/pc532/pc532/pmap.c                                     |     50 +-
 sys/arch/pc532/pc532/sys_machdep.c                              |     60 +-
 sys/arch/pc532/pc532/trap.c                                     |      4 +-
 sys/arch/pmax/conf/GENERIC                                      |      5 +-
 sys/arch/pmax/conf/files.pmax                                   |      6 +-
 sys/arch/powerpc/include/ansi.h                                 |     17 +-
 sys/arch/powerpc/include/int_types.h                            |      7 +-
 sys/arch/powerpc/include/types.h                                |     21 +-
 sys/arch/powerpc/powerpc/compat_13_machdep.c                    |      6 +-
 sys/arch/powerpc/powerpc/sig_machdep.c                          |     21 +-
 sys/arch/powerpc/powerpc/trap.c                                 |    104 +-
 sys/arch/powerpc/powerpc/trap_subr.S                            |     15 +-
 sys/arch/prep/conf/GENERIC                                      |      5 +-
 sys/arch/prep/conf/Makefile.prep                                |     10 +-
 sys/arch/prep/include/cpu.h                                     |      4 +-
 sys/arch/prep/include/pci_machdep.h                             |     10 +-
 sys/arch/prep/include/vmparam.h                                 |     12 +-
 sys/arch/prep/pci/pci_machdep.c                                 |     10 +-
 sys/arch/prep/pci/pcib.c                                        |      6 +-
 sys/arch/sgimips/include/pci_machdep.h                          |     10 +-
 sys/arch/sgimips/pci/pci_machdep.c                              |     14 +-
 sys/arch/sh3/conf/Makefile.sh3                                  |     37 +-
 sys/arch/sh3/conf/Makefile.sh3.be                               |      8 +-
 sys/arch/sh3/conf/Makefile.sh3.le                               |    202 -
 sys/arch/sh3/conf/build-sh3                                     |     14 -
 sys/arch/sh3/conf/build-sh3.eb                                  |     15 +
 sys/arch/sh3/conf/build-sh3.el                                  |     15 +
 sys/arch/sh3/include/ansi.h                                     |     17 +-
 sys/arch/sh3/include/asm.h                                      |      6 +-
 sys/arch/sh3/include/int_types.h                                |      7 +-
 sys/arch/sh3/include/param.h                                    |      4 +-
 sys/arch/sh3/include/types.h                                    |     21 +-
 sys/arch/sh3/sh3/compat_13_machdep.c                            |      6 +-
 sys/arch/sh3/sh3/pmap.c                                         |      7 +-
 sys/arch/sh3/sh3/sh3_machdep.c                                  |     21 +-
 sys/arch/sparc/conf/GENERIC                                     |      5 +-
 sys/arch/sparc/conf/Makefile.sparc                              |      8 +-
 sys/arch/sparc/include/ansi.h                                   |     17 +-
 sys/arch/sparc/include/int_types.h                              |      7 +-
 sys/arch/sparc/include/types.h                                  |     29 +-
 sys/arch/sparc/sparc/compat_13_machdep.c                        |      6 +-
 sys/arch/sparc/sparc/machdep.c                                  |     21 +-
 sys/arch/sparc/sparc/sunos_machdep.c                            |     13 +-
 sys/arch/sparc/sparc/svr4_machdep.c                             |     15 +-
 sys/arch/sparc/sparc/sys_machdep.c                              |     60 +-
 sys/arch/sparc64/conf/GENERIC32                                 |      7 +-
 sys/arch/sparc64/conf/Makefile.sparc64                          |      8 +-
 sys/arch/sparc64/dev/com_ebus.c                                 |      3 +-
 sys/arch/sparc64/dev/pci_machdep.c                              |     15 +-
 sys/arch/sparc64/include/ansi.h                                 |     17 +-
 sys/arch/sparc64/include/ctlreg.h                               |     28 +-
 sys/arch/sparc64/include/int_types.h                            |      7 +-
 sys/arch/sparc64/include/pcb.h                                  |      6 +-
 sys/arch/sparc64/include/pci_machdep.h                          |     10 +-
 sys/arch/sparc64/include/psl.h                                  |      6 +-
 sys/arch/sparc64/include/types.h                                |     29 +-
 sys/arch/sparc64/include/vmparam.h                              |     13 +-
 sys/arch/sparc64/sparc64/clock.c                                |     57 +-
 sys/arch/sparc64/sparc64/compat_13_machdep.c                    |     14 +-
 sys/arch/sparc64/sparc64/db_interface.c                         |      4 +-
 sys/arch/sparc64/sparc64/db_trace.c                             |    120 +-
 sys/arch/sparc64/sparc64/disksubr.c                             |     12 +-
 sys/arch/sparc64/sparc64/locore.s                               |     44 +-
 sys/arch/sparc64/sparc64/machdep.c                              |     45 +-
 sys/arch/sparc64/sparc64/netbsd32_machdep.c                     |     23 +-
 sys/arch/sparc64/sparc64/pmap.c                                 |    243 +-
 sys/arch/sparc64/sparc64/sunos_machdep.c                        |     17 +-
 sys/arch/sparc64/sparc64/svr4_machdep.c                         |     17 +-
 sys/arch/sparc64/sparc64/swapgeneric.c                          |     60 -
 sys/arch/sparc64/sparc64/sys_machdep.c                          |     60 +-
 sys/arch/sparc64/sparc64/trap.c                                 |     17 +-
 sys/arch/sparc64/sparc64/vm_machdep.c                           |      3 +-
 sys/arch/sun3/conf/FOUR_TTYS                                    |      3 +-
 sys/arch/sun3/conf/GENERIC                                      |      6 +-
 sys/arch/sun3/conf/GENERIC3X                                    |      4 +-
 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                                |      8 +-
 sys/arch/sun3/sun3/sys_machdep.c                                |     62 +-
 sys/arch/sun3/sun3/trap.c                                       |    255 +-
 sys/arch/vax/conf/GENERIC                                       |      6 +-
 sys/arch/vax/conf/INSTALL                                       |      3 +-
 sys/arch/vax/conf/Makefile.vax                                  |      8 +-
 sys/arch/vax/include/int_types.h                                |      7 +-
 sys/arch/vax/include/macros.h                                   |     42 +-
 sys/arch/vax/include/types.h                                    |     21 +-
 sys/arch/vax/vax/conf.c                                         |      4 +-
 sys/arch/vax/vax/db_machdep.c                                   |     55 +-
 sys/arch/vax/vax/intvec.s                                       |     20 +-
 sys/arch/vax/vax/machdep.c                                      |     23 +-
 sys/arch/vax/vax/pmap.c                                         |     60 +-
 sys/arch/vax/vax/trap.c                                         |     33 +-
 sys/arch/vax/vsa/dz_ibus.c                                      |     28 +-
 sys/arch/x68k/conf/ALL                                          |      8 +-
 sys/arch/x68k/conf/GENERIC                                      |      9 +-
 sys/arch/x68k/conf/INSTALL                                      |      8 +-
 sys/arch/x68k/conf/Makefile.x68k                                |     22 +-
 sys/arch/x68k/conf/TOKOCHAN                                     |      8 +-
 sys/arch/x68k/dev/rtclock.c                                     |      4 +-
 sys/arch/x68k/include/cpu.h                                     |      5 +-
 sys/arch/x68k/x68k/machdep.c                                    |     10 +-
 sys/arch/x68k/x68k/sys_machdep.c                                |     61 +-
 sys/arch/x68k/x68k/trap.c                                       |    241 +-
 sys/coda/coda_psdev.c                                           |     36 +-
 sys/compat/common/kern_sig_43.c                                 |      4 +-
 sys/compat/common/sysv_msg_14.c                                 |      4 +-
 sys/compat/common/sysv_sem_14.c                                 |      4 +-
 sys/compat/common/sysv_shm_14.c                                 |      4 +-
 sys/compat/freebsd/freebsd_exec.c                               |      4 +-
 sys/compat/freebsd/freebsd_misc.c                               |     29 +-
 sys/compat/freebsd/freebsd_syscall.h                            |      8 +-
 sys/compat/freebsd/freebsd_syscallargs.h                        |     10 +-
 sys/compat/freebsd/freebsd_syscalls.c                           |      8 +-
 sys/compat/freebsd/freebsd_sysent.c                             |     10 +-
 sys/compat/freebsd/syscalls.master                              |      6 +-
 sys/compat/hpux/hpux_compat.c                                   |      4 +-
 sys/compat/hpux/hpux_exec.c                                     |      6 +-
 sys/compat/hpux/hpux_sig.c                                      |     33 +-
 sys/compat/ibcs2/ibcs2_signal.c                                 |      4 +-
 sys/compat/linux/arch/alpha/linux_machdep.c                     |     37 +-
 sys/compat/linux/arch/alpha/linux_machdep.h                     |      3 +-
 sys/compat/linux/arch/alpha/linux_syscall.h                     |     24 +-
 sys/compat/linux/arch/alpha/linux_syscallargs.h                 |     54 +-
 sys/compat/linux/arch/alpha/linux_syscalls.c                    |     12 +-
 sys/compat/linux/arch/alpha/linux_sysent.c                      |    306 +-
 sys/compat/linux/arch/alpha/syscalls.conf                       |      3 +-
 sys/compat/linux/arch/alpha/syscalls.master                     |     16 +-
 sys/compat/linux/arch/i386/linux_commons.c                      |      4 +-
 sys/compat/linux/arch/i386/linux_machdep.c                      |     36 +-
 sys/compat/linux/arch/i386/linux_machdep.h                      |      7 +-
 sys/compat/linux/arch/i386/linux_syscall.h                      |    144 +-
 sys/compat/linux/arch/i386/linux_syscallargs.h                  |    133 +-
 sys/compat/linux/arch/i386/linux_syscalls.c                     |     84 +-
 sys/compat/linux/arch/i386/linux_sysent.c                       |    136 +-
 sys/compat/linux/arch/i386/syscalls.master                      |     95 +-
 sys/compat/linux/arch/m68k/linux_machdep.c                      |     63 +-
 sys/compat/linux/arch/m68k/linux_syscall.h                      |    140 +-
 sys/compat/linux/arch/m68k/linux_syscallargs.h                  |    133 +-
 sys/compat/linux/arch/m68k/linux_syscalls.c                     |     82 +-
 sys/compat/linux/arch/m68k/linux_sysent.c                       |    134 +-
 sys/compat/linux/arch/m68k/syscalls.master                      |     94 +-
 sys/compat/linux/common/linux_exec_elf32.c                      |    152 +-
 sys/compat/linux/common/linux_file.c                            |     87 +-
 sys/compat/linux/common/linux_misc.c                            |    221 +-
 sys/compat/linux/common/linux_misc.h                            |     20 +-
 sys/compat/linux/common/linux_misc_notalpha.c                   |      4 +-
 sys/compat/linux/common/linux_oldmmap.c                         |      4 +-
 sys/compat/linux/common/linux_oldolduname.c                     |     21 +-
 sys/compat/linux/common/linux_olduname.c                        |     21 +-
 sys/compat/linux/common/linux_socket.c                          |     66 +-
 sys/compat/linux/common/linux_sockio.h                          |      7 +-
 sys/compat/linux/common/linux_types.h                           |      6 +-
 sys/compat/netbsd32/netbsd32_exec_aout.c                        |     57 +-
 sys/compat/netbsd32/netbsd32_netbsd.c                           |      4 +-
 sys/compat/svr4/svr4_signal.c                                   |      8 +-
 sys/compat/ultrix/ultrix_misc.c                                 |      6 +-
 sys/conf/files                                                  |     96 +-
 sys/conf/osrelease.sh                                           |      4 +-
 sys/ddb/TODO                                                    |      6 +-
 sys/ddb/db_examine.c                                            |     39 +-
 sys/ddb/db_trap.c                                               |     10 +-
 sys/dev/DEVNAMES                                                |      7 +-
 sys/dev/ata/wd.c                                                |      6 +-
 sys/dev/audio.c                                                 |      7 +-
 sys/dev/bi/if_ni.c                                              |      8 +-
 sys/dev/i2o/iop.c                                               |    153 +-
 sys/dev/i2o/iopvar.h                                            |     21 +-
 sys/dev/i2o/ld_iop.c                                            |     12 +-
 sys/dev/ic/ac97.c                                               |      8 +-
 sys/dev/ic/ac97reg.h                                            |      5 +-
 sys/dev/ic/am7990.c                                             |      4 +-
 sys/dev/ic/am79900.c                                            |      4 +-
 sys/dev/ic/an.c                                                 |    301 +-
 sys/dev/ic/anreg.h                                              |      5 +-
 sys/dev/ic/anvar.h                                              |     25 +-
 sys/dev/ic/awi.c                                                |     26 +-
 sys/dev/ic/bt8xx.h                                              |     18 +-
 sys/dev/ic/daic.c                                               |   1060 +
 sys/dev/ic/daicreg.h                                            |    150 +
 sys/dev/ic/daicvar.h                                            |    101 +
 sys/dev/ic/dp8390.c                                             |      5 +-
 sys/dev/ic/elink3.c                                             |      9 +-
 sys/dev/ic/elinkxl.c                                            |     17 +-
 sys/dev/ic/hd64570.c                                            |     40 +-
 sys/dev/ic/hme.c                                                |      5 +-
 sys/dev/ic/i4b_hscx.c                                           |    679 +
 sys/dev/ic/i4b_hscx.h                                           |    301 +
 sys/dev/ic/i4b_ipac.h                                           |    204 +
 sys/dev/ic/i4b_isac.c                                           |    683 +
 sys/dev/ic/i4b_isac.h                                           |    391 +
 sys/dev/ic/i4b_isic.c                                           |    341 +
 sys/dev/ic/i4b_isicbchan.c                                      |    470 +
 sys/dev/ic/i4b_isicl1.c                                         |    315 +
 sys/dev/ic/i4b_isicl1.h                                         |    528 +
 sys/dev/ic/i4b_isicl1fsm.c                                      |    531 +
 sys/dev/ic/i82557.c                                             |     19 +-
 sys/dev/ic/i82586.c                                             |      7 +-
 sys/dev/ic/isp.c                                                |     93 +-
 sys/dev/ic/isp_inline.h                                         |     21 +-
 sys/dev/ic/isp_netbsd.c                                         |     33 +-
 sys/dev/ic/isp_netbsd.h                                         |     42 +-
 sys/dev/ic/isp_target.c                                         |     21 +-
 sys/dev/ic/isp_target.h                                         |     24 +-
 sys/dev/ic/isp_tpublic.h                                        |     21 +-
 sys/dev/ic/ispmbox.h                                            |     21 +-
 sys/dev/ic/ispreg.h                                             |     21 +-
 sys/dev/ic/ispvar.h                                             |     28 +-
 sys/dev/ic/lance.c                                              |      3 +-
 sys/dev/ic/lemac.c                                              |     13 +-
 sys/dev/ic/mb86960.c                                            |      5 +-
 sys/dev/ic/midway.c                                             |      5 +-
 sys/dev/ic/ncr53c9x.c                                           |     98 +-
 sys/dev/ic/ncr53c9xvar.h                                        |     10 +-
 sys/dev/ic/pdq_ifsubr.c                                         |     14 +-
 sys/dev/ic/rrunner.c                                            |      5 +-
 sys/dev/ic/rtl81x9.c                                            |     21 +-
 sys/dev/ic/seeq8005.c                                           |     11 +-
 sys/dev/ic/sgec.c                                               |      7 +-
 sys/dev/ic/smc83c170.c                                          |     18 +-
 sys/dev/ic/smc90cx6.c                                           |      5 +-
 sys/dev/ic/smc91cxx.c                                           |     10 +-
 sys/dev/ic/tropic.c                                             |     13 +-
 sys/dev/ic/tulip.c                                              |     22 +-
 sys/dev/ieee1394/if_fw.c                                        |      4 +-
 sys/dev/isa/ad1848_isa.c                                        |     46 +-
 sys/dev/isa/ad1848var.h                                         |      8 +-
 sys/dev/isa/cs89x0.c                                            |     14 +-
 sys/dev/isa/fd.c                                                |     26 +-
 sys/dev/isa/files.isa                                           |     18 +-
 sys/dev/isa/i4b_avm_a1.c                                        |    507 +
 sys/dev/isa/i4b_itk_ix1.c                                       |    496 +
 sys/dev/isa/i4b_tel_s016.c                                      |    455 +
 sys/dev/isa/i4b_tel_s0163.c                                     |    602 +
 sys/dev/isa/i4b_tel_s08.c                                       |    388 +
 sys/dev/isa/i4b_usr_sti.c                                       |    439 +
 sys/dev/isa/i82365_isasubr.c                                    |     20 +-
 sys/dev/isa/if_cs_isa.c                                         |      7 +-
 sys/dev/isa/if_eg.c                                             |      7 +-
 sys/dev/isa/if_el.c                                             |      5 +-
 sys/dev/isa/if_iy.c                                             |     11 +-
 sys/dev/isa/isa_isic.c                                          |   1299 +
 sys/dev/isa/isadaic.c                                           |    146 +
 sys/dev/isa/sb.c                                                |      4 +-
 sys/dev/isa/sbdspvar.h                                          |      5 +-
 sys/dev/isa/seagate.c                                           |      4 +-
 sys/dev/isapnp/files.isapnp                                     |     23 +-
 sys/dev/isapnp/i4b_ctx_s0P.c                                    |    358 +
 sys/dev/isapnp/i4b_drn_ngo.c                                    |    534 +
 sys/dev/isapnp/i4b_dynalink.c                                   |    570 +
 sys/dev/isapnp/i4b_elsa_qs1i.c                                  |    501 +
 sys/dev/isapnp/i4b_siemens_isurf.c                              |    479 +
 sys/dev/isapnp/i4b_sws.c                                        |    386 +
 sys/dev/isapnp/i4b_tel_s0P.c                                    |    373 +
 sys/dev/isapnp/if_an_isapnp.c                                   |    157 +
 sys/dev/isapnp/isapnp_isic.c                                    |    412 +
 sys/dev/isapnp/isapnpdevs                                       |      9 +-
 sys/dev/isapnp/isapnpdevs.c                                     |     16 +-
 sys/dev/isapnp/isapnpdevs.h                                     |      6 +-
 sys/dev/isapnp/sb_isapnp.c                                      |      7 +-
 sys/dev/ld.c                                                    |     38 +-
 sys/dev/ldvar.h                                                 |      9 +-
 sys/dev/microcode/Makefile                                      |      4 +-
 sys/dev/microcode/isp/asm_2200.h                                |  10146 ++++-----
 sys/dev/ofisa/if_cs_ofisa.c                                     |      7 +-
 sys/dev/pci/adv_pci.c                                           |      5 +-
 sys/dev/pci/adw_pci.c                                           |      5 +-
 sys/dev/pci/ahc_pci.c                                           |      5 +-
 sys/dev/pci/auich.c                                             |      5 +-
 sys/dev/pci/auvia.c                                             |     22 +-
 sys/dev/pci/bha_pci.c                                           |      5 +-
 sys/dev/pci/bktr/bktr_audio.c                                   |     66 +-
 sys/dev/pci/bktr/bktr_card.c                                    |     56 +-
 sys/dev/pci/bktr/bktr_core.c                                    |     34 +-
 sys/dev/pci/bktr/bktr_os.c                                      |      7 +-
 sys/dev/pci/bktr/bktr_reg.h                                     |      8 +-
 sys/dev/pci/bktr/bktr_tuner.c                                   |      4 +-
 sys/dev/pci/btvmei.c                                            |      5 +-
 sys/dev/pci/cac_pci.c                                           |      5 +-
 sys/dev/pci/cmpci.c                                             |      5 +-
 sys/dev/pci/cs4280.c                                            |      5 +-
 sys/dev/pci/cy_pci.c                                            |      5 +-
 sys/dev/pci/cz.c                                                |      5 +-
 sys/dev/pci/dpt_pci.c                                           |      7 +-
 sys/dev/pci/eap.c                                               |      5 +-
 sys/dev/pci/ehci_pci.c                                          |    197 +
 sys/dev/pci/eso.c                                               |      5 +-
 sys/dev/pci/files.pci                                           |     21 +-
 sys/dev/pci/fms.c                                               |      5 +-
 sys/dev/pci/fwohci_pci.c                                        |      5 +-
 sys/dev/pci/hifn7751.c                                          |      5 +-
 sys/dev/pci/i4b_avm_fritz_pci.c                                 |   1756 +
 sys/dev/pci/i4b_elsa_qs1p.c                                     |    456 +
 sys/dev/pci/if_an_pci.c                                         |    184 +
 sys/dev/pci/if_de.c                                             |      5 +-
 sys/dev/pci/if_en_pci.c                                         |      5 +-
 sys/dev/pci/if_ep_pci.c                                         |      5 +-
 sys/dev/pci/if_epic_pci.c                                       |      5 +-
 sys/dev/pci/if_esh_pci.c                                        |      5 +-
 sys/dev/pci/if_ex_pci.c                                         |      5 +-
 sys/dev/pci/if_fpa.c                                            |      5 +-
 sys/dev/pci/if_fxp_pci.c                                        |      5 +-
 sys/dev/pci/if_hme_pci.c                                        |      5 +-
 sys/dev/pci/if_le_pci.c                                         |      5 +-
 sys/dev/pci/if_lmc_nbsd.c                                       |      5 +-
 sys/dev/pci/if_ne_pci.c                                         |      5 +-
 sys/dev/pci/if_ntwoc_pci.c                                      |      5 +-
 sys/dev/pci/if_rtk_pci.c                                        |      5 +-
 sys/dev/pci/if_sip.c                                            |     25 +-
 sys/dev/pci/if_ti.c                                             |     25 +-
 sys/dev/pci/if_tl.c                                             |      7 +-
 sys/dev/pci/if_tlp_pci.c                                        |      5 +-
 sys/dev/pci/if_vr.c                                             |     23 +-
 sys/dev/pci/iop_pci.c                                           |      5 +-
 sys/dev/pci/isp_pci.c                                           |     48 +-
 sys/dev/pci/ncr.c                                               |      7 +-
 sys/dev/pci/neo.c                                               |      5 +-
 sys/dev/pci/ohci_pci.c                                          |      5 +-
 sys/dev/pci/pccbb.c                                             |     25 +-
 sys/dev/pci/pccbbvar.h                                          |      6 +-
 sys/dev/pci/pci_isic.c                                          |    354 +
 sys/dev/pci/pci_isic.h                                          |     53 +
 sys/dev/pci/pcidevs                                             |     24 +-
 sys/dev/pci/pcidevs.h                                           |     26 +-
 sys/dev/pci/pcidevs_data.h                                      |    104 +-
 sys/dev/pci/pciide.c                                            |     57 +-
 sys/dev/pci/pciide_apollo_reg.h                                 |      4 +-
 sys/dev/pci/pciide_hpt_reg.h                                    |      5 +-
 sys/dev/pci/pciide_piix_reg.h                                   |     10 +-
 sys/dev/pci/pcscp.c                                             |      5 +-
 sys/dev/pci/puc.c                                               |      6 +-
 sys/dev/pci/pucdata.c                                           |    272 +-
 sys/dev/pci/pucvar.h                                            |     11 +-
 sys/dev/pci/siop_pci_common.c                                   |      5 +-
 sys/dev/pci/sv.c                                                |      5 +-
 sys/dev/pci/tga.c                                               |     16 +-
 sys/dev/pci/twe.c                                               |      5 +-
 sys/dev/pci/uhci_pci.c                                          |      5 +-
 sys/dev/pci/universe_pci.c                                      |      5 +-
 sys/dev/pckbc/wskbdmap_mfii.c                                   |      4 +-
 sys/dev/pcmcia/files.pcmcia                                     |     14 +-
 sys/dev/pcmcia/i4b_avm_fritz_pcmcia.c                           |    499 +
 sys/dev/pcmcia/i4b_elsa_isdnmc.c                                |    323 +
 sys/dev/pcmcia/i4b_elsa_mcall.c                                 |    249 +
 sys/dev/pcmcia/if_an_pcmcia.c                                   |    213 +-
 sys/dev/pcmcia/if_cnw.c                                         |      5 +-
 sys/dev/pcmcia/if_ray.c                                         |     13 +-
 sys/dev/pcmcia/if_wi.c                                          |     17 +-
 sys/dev/pcmcia/if_xi.c                                          |     10 +-
 sys/dev/pcmcia/pcmcia_isic.c                                    |    369 +
 sys/dev/pcmcia/pcmcia_isic.h                                    |     60 +
 sys/dev/pcmcia/pcmciadevs                                       |      6 +-
 sys/dev/pcmcia/pcmciadevs.h                                     |     12 +-
 sys/dev/pcmcia/pcmciadevs_data.h                                |     18 +-
 sys/dev/pcmcia/wdc_pcmcia.c                                     |     27 +-
 sys/dev/qbus/dz.c                                               |     26 +-
 sys/dev/qbus/dzvar.h                                            |      9 +-
 sys/dev/qbus/files.uba                                          |      4 +-
 sys/dev/qbus/if_de.c                                            |      6 +-
 sys/dev/qbus/if_qe.c                                            |     10 +-
 sys/dev/raidframe/rf_driver.c                                   |     23 +-
 sys/dev/raidframe/rf_general.h                                  |     11 +-
 sys/dev/rasops/rasops.c                                         |      6 +-
 sys/dev/sbus/be.c                                               |      5 +-
 sys/dev/sbus/isp_sbus.c                                         |     21 +-
 sys/dev/sbus/qe.c                                               |      5 +-
 sys/dev/scsipi/if_se.c                                          |      7 +-
 sys/dev/scsipi/scsipiconf.c                                     |      8 +-
 sys/dev/scsipi/ss.c                                             |    118 +-
 sys/dev/sun/sunkbd.c                                            |      4 +-
 sys/dev/tc/Makefile                                             |      6 +-
 sys/dev/tc/files.tc                                             |     28 +-
 sys/dev/tc/px.c                                                 |    285 +
 sys/dev/tc/pxg.c                                                |    423 +
 sys/dev/tc/sfbreg.h                                             |     51 +-
 sys/dev/tc/stic.c                                               |   1442 +
 sys/dev/tc/sticreg.h                                            |    244 +
 sys/dev/tc/sticvar.h                                            |    159 +
 sys/dev/tc/tcdevs                                               |     16 +-
 sys/dev/tc/tcdevs.h                                             |     23 +-
 sys/dev/tc/tcdevs_data.h                                        |     19 +-
 sys/dev/usb/ehci.c                                              |    132 +
 sys/dev/usb/ehcireg.h                                           |     73 +
 sys/dev/usb/ehcivar.h                                           |     57 +
 sys/dev/usb/ezload.c                                            |    169 +
 sys/dev/usb/ezload.h                                            |     47 +
 sys/dev/usb/files.usb                                           |     11 +-
 sys/dev/usb/if_aue.c                                            |     15 +-
 sys/dev/usb/if_cue.c                                            |     13 +-
 sys/dev/usb/if_kue.c                                            |     13 +-
 sys/dev/usb/ohci.c                                              |     24 +-
 sys/dev/usb/uaudio.c                                            |    374 +-
 sys/dev/usb/uaudioreg.h                                         |     67 +-
 sys/dev/usb/ugraphire_rdesc.h                                   |     91 +
 sys/dev/usb/uhci.c                                              |     13 +-
 sys/dev/usb/uhid.c                                              |     26 +-
 sys/dev/usb/uhub.c                                              |      4 +-
 sys/dev/usb/ukbd.c                                              |      4 +-
 sys/dev/usb/ulpt.c                                              |      4 +-
 sys/dev/usb/umass.c                                             |     18 +-
 sys/dev/usb/umodem.c                                            |      5 +-
 sys/dev/usb/ums.c                                               |      4 +-
 sys/dev/usb/usb_quirks.c                                        |      7 +-
 sys/dev/usb/usb_quirks.h                                        |      6 +-
 sys/dev/usb/usbdevs                                             |     13 +-
 sys/dev/usb/usbdevs.h                                           |     15 +-
 sys/dev/usb/usbdevs_data.h                                      |     38 +-
 sys/dev/usb/usbdivar.h                                          |      3 +-
 sys/dev/usb/uscanner.c                                          |      7 +-
 sys/dev/usb/uyap.c                                              |    113 +
 sys/dev/usb/uyap_firmware.h                                     |      1 +
 sys/dev/wscons/wsdisplay.c                                      |     52 +-
 sys/dev/wscons/wsdisplayvar.h                                   |      3 +-
 sys/isofs/cd9660/cd9660_vfsops.c                                |      4 +-
 sys/kern/cnmagic.c                                              |      6 +-
 sys/kern/exec_conf.c                                            |      4 +-
 sys/kern/exec_elf32.c                                           |     86 +-
 sys/kern/init_main.c                                            |      4 +-
 sys/kern/init_sysent.c                                          |      8 +-
 sys/kern/kern_exec.c                                            |      6 +-
 sys/kern/kern_exit.c                                            |      8 +-
 sys/kern/kern_fork.c                                            |      9 +-
 sys/kern/kern_ktrace.c                                          |     72 +-
 sys/kern/kern_lock.c                                            |      4 +-
 sys/kern/kern_sig.c                                             |    290 +-
 sys/kern/kern_synch.c                                           |     14 +-
 sys/kern/kern_sysctl.c                                          |     10 +-
 sys/kern/makesyscalls.sh                                        |      9 +-
 sys/kern/syscalls.c                                             |      5 +-
 sys/kern/syscalls.master                                        |      4 +-
 sys/kern/tty.c                                                  |     10 +-
 sys/kern/vfs_bio.c                                              |      3 +-
 sys/kern/vfs_getcwd.c                                           |      5 +-
 sys/kern/vfs_subr.c                                             |      3 +-
 sys/kern/vnode_if.c                                             |      6 +-
 sys/kern/vnode_if.sh                                            |      6 +-
 sys/lib/libkern/Makefile                                        |      4 +-
 sys/lib/libkern/arch/arm26/Makefile.inc                         |      9 -
 sys/lib/libkern/arch/arm26/_memcpy.S                            |    463 -
 sys/lib/libkern/arch/arm26/bcopy.S                              |     48 -
 sys/lib/libkern/arch/arm26/byte_swap_2.S                        |     53 -
 sys/lib/libkern/arch/arm26/byte_swap_4.S                        |     54 -
 sys/lib/libkern/arch/arm26/bzero.S                              |     44 -
 sys/lib/libkern/arch/arm26/divsi3.S                             |    398 -
 sys/lib/libkern/arch/arm26/memcpy.S                             |     48 -
 sys/lib/libkern/arch/arm26/memmove.S                            |     48 -
 sys/lib/libkern/arch/arm26/memset.S                             |    134 -
 sys/lib/libkern/arch/arm32/byte_swap_2.S                        |      9 +-
 sys/lib/libkern/arch/arm32/byte_swap_4.S                        |      9 +-
 sys/lib/libkern/arch/i386/byte_swap_2.S                         |     11 +-
 sys/lib/libkern/arch/i386/byte_swap_4.S                         |     11 +-
 sys/lkm/compat/freebsd/Makefile                                 |     24 +-
 sys/lkm/compat/freebsd/lkminit_emul.c                           |      4 +-
 sys/lkm/compat/linux/Makefile                                   |      4 +-
 sys/lkm/compat/sunos/lkminit_emul.c                             |      4 +-
 sys/lkm/compat/svr4/lkminit_emul.c                              |      4 +-
 sys/miscfs/genfs/genfs_vnops.c                                  |     16 +-
 sys/miscfs/genfs/layer_vnops.c                                  |     11 +-
 sys/miscfs/procfs/procfs_status.c                               |      4 +-
 sys/msdosfs/msdosfs_denode.c                                    |      8 +-
 sys/msdosfs/msdosfs_fat.c                                       |      9 +-
 sys/net/bpf.c                                                   |     16 +-
 sys/net/if.c                                                    |     27 +-
 sys/net/if.h                                                    |    146 +-
 sys/net/if_arcsubr.c                                            |      3 +-
 sys/net/if_atmsubr.c                                            |     23 +-
 sys/net/if_ethersubr.c                                          |     35 +-
 sys/net/if_faith.c                                              |      3 +-
 sys/net/if_fddisubr.c                                           |     28 +-
 sys/net/if_gif.c                                                |      3 +-
 sys/net/if_gre.c                                                |      3 +-
 sys/net/if_hippisubr.c                                          |     24 +-
 sys/net/if_ieee1394subr.c                                       |      7 +-
 sys/net/if_ieee80211.h                                          |     13 +-
 sys/net/if_loop.c                                               |    118 +-
 sys/net/if_ppp.c                                                |     62 +-
 sys/net/if_sl.c                                                 |     40 +-
 sys/net/if_spppsubr.c                                           |     73 +-
 sys/net/if_stf.c                                                |      3 +-
 sys/net/if_strip.c                                              |     44 +-
 sys/net/if_tokensubr.c                                          |     28 +-
 sys/net/if_tun.c                                                |      3 +-
 sys/net/if_vlan.c                                               |     19 +-
 sys/net/pfil.c                                                  |     11 +-
 sys/net/pfil.h                                                  |     16 +-
 sys/net/radix.c                                                 |     32 +-
 sys/net/radix.h                                                 |      3 +-
 sys/netinet/ip_fil.c                                            |     18 +-
 sys/netinet/ip_input.c                                          |     14 +-
 sys/netinet/ip_ipip.c                                           |      8 +-
 sys/netinet/tcp_subr.c                                          |      4 +-
 sys/netinet6/in6_pcb.c                                          |     11 +-
 sys/netinet6/in6_prefix.c                                       |      8 +-
 sys/netinet6/ip6_input.c                                        |     14 +-
 sys/netinet6/ipsec.h                                            |     10 +-
 sys/nfs/nfs_bio.c                                               |     52 +-
 sys/nfs/nfs_socket.c                                            |      5 +-
 sys/sys/audioio.h                                               |      3 +-
 sys/sys/cdefs.h                                                 |      6 +-
 sys/sys/cdefs_elf.h                                             |     21 +-
 sys/sys/disklabel.h                                             |      2 +
 sys/sys/disklabel_mbr.h                                         |      6 +-
 sys/sys/exec_elf.h                                              |     29 +-
 sys/sys/ioctl.h                                                 |     24 +-
 sys/sys/ktrace.h                                                |     17 +-
 sys/sys/localedef.h                                             |      8 +-
 sys/sys/param.h                                                 |      4 +-
 sys/sys/proc.h                                                  |     19 +-
 sys/sys/signalvar.h                                             |     38 +-
 sys/sys/sockio.h                                                |      3 +-
 sys/sys/syscall.h                                               |     18 +-
 sys/sys/syscallargs.h                                           |     11 +-
 sys/sys/types.h                                                 |      5 +-
 sys/sys/vnode_if.h                                              |      6 +-
 sys/ufs/ffs/ffs_bswap.c                                         |     31 +-
 sys/ufs/ffs/ffs_inode.c                                         |      4 +-
 sys/ufs/ffs/ffs_softdep.c                                       |     45 +-
 sys/ufs/lfs/lfs.h                                               |      6 +-
 sys/uvm/uvm_anon.c                                              |     20 +-
 sys/uvm/uvm_anon.h                                              |      4 +-
 sys/uvm/uvm_bio.c                                               |     68 +-
 sys/uvm/uvm_page.h                                              |     61 +-
 sys/uvm/uvm_param.h                                             |      4 +-
 sys/uvm/uvm_pdaemon.c                                           |      7 +-
 sys/uvm/uvm_swap.c                                              |     52 +-
 sys/uvm/uvm_vnode.c                                             |      4 +-
 981 files changed, 75015 insertions(+), 37272 deletions(-)

diffs (truncated from 139689 to 300 lines):

diff -r 0c55476a2491 -r 2f7e7a6f4439 sys/Makefile
--- a/sys/Makefile      Tue Dec 19 21:59:08 2000 +0000
+++ b/sys/Makefile      Fri Jan 05 17:33:37 2001 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.36.2.1 2000/11/20 22:19:20 bouyer Exp $
+#      $NetBSD: Makefile,v 1.36.2.2 2001/01/05 17:33:37 bouyer Exp $
 
-SUBDIR=        adosfs arch compat dev filecorefs isofs miscfs msdosfs net \
+SUBDIR=        adosfs altq arch compat dev filecorefs isofs miscfs msdosfs net \
        netatalk netccitt netinet netinet6 netiso netkey netnatm netns \
-       nfs ntfs sys ufs uvm
+       nfs ntfs sys ufs uvm netisdn
 
 .if (${MACHINE_ARCH} != "mipseb" && ${MACHINE_ARCH} != "mipsel")
 
diff -r 0c55476a2491 -r 2f7e7a6f4439 sys/altq/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/altq/Makefile Fri Jan 05 17:33:37 2001 +0000
@@ -0,0 +1,12 @@
+#      $NetBSD: Makefile,v 1.1.2.2 2001/01/05 17:39:35 bouyer Exp $
+
+KDIR=  /sys/altq
+INCSDIR= /usr/include/altq
+
+INCS=  altq.h altq_afmap.h altq_blue.h altq_cbq.h altq_cdnr.h \
+       altq_classq.h altq_conf.h altq_fifoq.h altq_flowvalve.h \
+       altq_hfsc.h altq_priq.h altq_red.h altq_rio.h altq_rmclass.h \
+       altq_rmclass_debug.h altq_var.h altq_wfq.h altqconf.h \
+       if_altq.h
+
+.include <bsd.kinc.mk>
diff -r 0c55476a2491 -r 2f7e7a6f4439 sys/altq/altq.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/altq/altq.h   Fri Jan 05 17:33:37 2001 +0000
@@ -0,0 +1,199 @@
+/*     $NetBSD: altq.h,v 1.2.2.2 2001/01/05 17:39:35 bouyer Exp $      */
+/*     $KAME: altq.h,v 1.6 2000/12/14 08:12:45 thorpej Exp $   */
+
+/*
+ * Copyright (C) 1998-2000
+ *     Sony Computer Science Laboratories Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SONY CSL AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL SONY CSL OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _ALTQ_ALTQ_H_
+#define        _ALTQ_ALTQ_H_
+
+#include <sys/param.h>
+#include <sys/ioccom.h>
+#include <sys/queue.h>
+#include <netinet/in.h>
+
+#ifndef IFNAMSIZ
+#define        IFNAMSIZ        16
+#endif
+
+/* altq discipline type */
+#define        ALTQT_NONE              0       /* reserved */
+#define        ALTQT_CBQ               1       /* cbq */
+#define        ALTQT_WFQ               2       /* wfq */
+#define        ALTQT_AFMAP             3       /* afmap */
+#define        ALTQT_FIFOQ             4       /* fifoq */
+#define        ALTQT_RED               5       /* red */
+#define        ALTQT_RIO               6       /* rio */
+#define        ALTQT_LOCALQ            7       /* local use */
+#define        ALTQT_HFSC              8       /* hfsc */
+#define        ALTQT_CDNR              9       /* traffic conditioner */
+#define        ALTQT_BLUE              10      /* blue */
+#define        ALTQT_PRIQ              11      /* priority queue */
+#define        ALTQT_MAX               12      /* should be max discipline type + 1 */
+
+struct altqreq {
+       char    ifname[IFNAMSIZ];       /* if name, e.g. "en0" */
+       u_long  arg;                    /* request-specific argument */
+};
+
+/* simple token backet meter profile */
+struct tb_profile {
+       u_int   rate;   /* rate in bit-per-sec */
+       u_int   depth;  /* depth in bytes */
+};
+
+struct tbrreq {
+       char    ifname[IFNAMSIZ];       /* if name, e.g. "en0" */
+       struct  tb_profile tb_prof;     /* token bucket profile */
+};
+
+/*
+ * common network flow info structure
+ */
+struct flowinfo {
+       u_char          fi_len;         /* total length */
+       u_char          fi_family;      /* address family */
+       u_int8_t        fi_data[46];    /* actually longer; address family
+                                          specific flow info. */
+};
+
+/*
+ * flow info structure for internet protocol family.
+ * (currently this is the only protocol family supported)
+ */
+struct flowinfo_in {
+       u_char          fi_len;         /* sizeof(struct flowinfo_in) */
+       u_char          fi_family;      /* AF_INET */
+       u_int8_t        fi_proto;       /* IPPROTO_XXX */
+       u_int8_t        fi_tos;         /* type-of-service */
+       struct in_addr  fi_dst;         /* dest address */
+       struct in_addr  fi_src;         /* src address */
+       u_int16_t       fi_dport;       /* dest port */
+       u_int16_t       fi_sport;       /* src port */
+       u_int32_t       fi_gpi;         /* generalized port id for ipsec */
+       u_int8_t        _pad[28];       /* make the size equal to
+                                          flowinfo_in6 */
+};
+
+#ifdef SIN6_LEN
+struct flowinfo_in6 {
+       u_char          fi6_len;        /* sizeof(struct flowinfo_in6) */
+       u_char          fi6_family;     /* AF_INET6 */
+       u_int8_t        fi6_proto;      /* IPPROTO_XXX */
+       u_int8_t        fi6_tclass;     /* traffic class */
+       u_int32_t       fi6_flowlabel;  /* ipv6 flowlabel */
+       u_int16_t       fi6_dport;      /* dest port */
+       u_int16_t       fi6_sport;      /* src port */
+       u_int32_t       fi6_gpi;        /* generalized port id */
+       struct in6_addr fi6_dst;        /* dest address */
+       struct in6_addr fi6_src;        /* src address */
+};
+#endif /* INET6 */
+
+/*
+ * flow filters for AF_INET and AF_INET6
+ */
+struct flow_filter {
+       int                     ff_ruleno;
+       struct flowinfo_in      ff_flow;
+       struct {
+               struct in_addr  mask_dst;
+               struct in_addr  mask_src;
+               u_int8_t        mask_tos;
+               u_int8_t        _pad[3];
+       } ff_mask;
+       u_int8_t _pad2[24];     /* make the size equal to flow_filter6 */
+};
+
+#ifdef SIN6_LEN
+struct flow_filter6 {
+       int                     ff_ruleno;
+       struct flowinfo_in6     ff_flow6;
+       struct {
+               struct in6_addr mask6_dst;
+               struct in6_addr mask6_src;
+               u_int8_t        mask6_tclass;
+               u_int8_t        _pad[3];
+       } ff_mask6;
+};
+#endif /* INET6 */
+
+/*
+ * generic packet counter
+ */
+struct pktcntr {
+       u_int64_t       packets;
+       u_int64_t       bytes;
+};
+
+#define        PKTCNTR_ADD(cntr, len)  \
+       do { (cntr)->packets++; (cntr)->bytes += len; } while (0)
+
+/*
+ * altq related ioctls
+ */
+#define        ALTQGTYPE       _IOWR('q', 0, struct altqreq)   /* get queue type */
+#if 0
+/*
+ * these ioctls are currently discipline-specific but could be shared
+ * in the future.
+ */
+#define        ALTQATTACH      _IOW('q', 1, struct altqreq)    /* attach discipline */
+#define        ALTQDETACH      _IOW('q', 2, struct altqreq)    /* detach discipline */
+#define        ALTQENABLE      _IOW('q', 3, struct altqreq)    /* enable discipline */
+#define        ALTQDISABLE     _IOW('q', 4, struct altqreq)    /* disable discipline*/
+#define        ALTQCLEAR       _IOW('q', 5, struct altqreq)    /* (re)initialize */
+#define        ALTQCONFIG      _IOWR('q', 6, struct altqreq)   /* set config params */
+#define        ALTQADDCLASS    _IOWR('q', 7, struct altqreq)   /* add a class */
+#define        ALTQMODCLASS    _IOWR('q', 8, struct altqreq)   /* modify a class */
+#define        ALTQDELCLASS    _IOWR('q', 9, struct altqreq)   /* delete a class */
+#define        ALTQADDFILTER   _IOWR('q', 10, struct altqreq)  /* add a filter */
+#define        ALTQDELFILTER   _IOWR('q', 11, struct altqreq)  /* delete a filter */
+#define        ALTQGETSTATS    _IOWR('q', 12, struct altqreq)  /* get statistics */
+#define        ALTQGETCNTR     _IOWR('q', 13, struct altqreq)  /* get a pkt counter */
+#endif /* 0 */
+#define        ALTQTBRSET      _IOW('q', 14, struct tbrreq)    /* set tb regulator */
+#define        ALTQTBRGET      _IOWR('q', 15, struct tbrreq)   /* get tb regulator */
+
+/* queue macros only in FreeBSD */
+#ifndef LIST_EMPTY
+#define        LIST_EMPTY(head) ((head)->lh_first == NULL)
+#endif
+#ifndef LIST_FOREACH
+#define        LIST_FOREACH(var, head, field)                                  \
+       for((var) = (head)->lh_first; (var); (var) = (var)->field.le_next)
+#endif
+
+#ifdef KERNEL
+#ifndef _KERNEL
+#define        _KERNEL
+#endif
+#endif
+
+#ifdef _KERNEL
+#include <altq/altq_var.h>
+#endif
+
+#endif /* _ALTQ_ALTQ_H_ */
diff -r 0c55476a2491 -r 2f7e7a6f4439 sys/altq/altq_afmap.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/altq/altq_afmap.c     Fri Jan 05 17:33:37 2001 +0000
@@ -0,0 +1,412 @@
+/*     $NetBSD: altq_afmap.c,v 1.2.2.2 2001/01/05 17:39:35 bouyer Exp $        */
+/*     $KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $     */
+
+/*
+ * Copyright (C) 1997-2000
+ *     Sony Computer Science Laboratories Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SONY CSL AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL SONY CSL OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * experimental:
+ * mapping an ip flow to atm vpi/vci.
+ * this module is not related to queueing at all, but uses the altq
+ * flowinfo mechanism.  it's just put in the altq framework since
+ * it is easy to add devices to altq.
+ */
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include "opt_altq.h"
+#if (__FreeBSD__ != 2)
+#include "opt_inet.h"
+#ifdef __FreeBSD__
+#include "opt_inet6.h"
+#endif
+#endif
+#endif /* __FreeBSD__ || __NetBSD__ */
+#ifdef ALTQ_AFMAP
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+#include <netinet/in.h>



Home | Main Index | Thread Index | Old Index