PERFORCE change 82211 for review

John Baldwin jhb at FreeBSD.org
Thu Aug 18 17:05:01 GMT 2005


http://perforce.freebsd.org/chv.cgi?CH=82211

Change 82211 by jhb at jhb_slimer on 2005/08/18 17:04:21

	IFC @82210.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#17 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#6 integrate
.. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#20 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#13 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#43 integrate
.. //depot/projects/smpng/sys/amd64/include/atomic.h#25 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/smpng/sys/arm/arm/db_trace.c#12 integrate
.. //depot/projects/smpng/sys/boot/common/loader.8#37 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#36 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf.5#10 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#26 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/lib.h#2 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/sio.S#4 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/comconsole.c#4 integrate
.. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#14 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#20 integrate
.. //depot/projects/smpng/sys/coda/coda_fbsd.c#15 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#40 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#22 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#9 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#9 integrate
.. //depot/projects/smpng/sys/conf/files#146 integrate
.. //depot/projects/smpng/sys/conf/files.i386#85 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_cbq.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#14 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#10 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#15 integrate
.. //depot/projects/smpng/sys/crypto/rijndael/rijndael-alg-fst.c#6 integrate
.. //depot/projects/smpng/sys/crypto/via/padlock.c#1 branch
.. //depot/projects/smpng/sys/ddb/db_command.c#23 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_compat.h#3 delete
.. //depot/projects/smpng/sys/dev/aac/aac_debug.c#16 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#39 integrate
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#5 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#33 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#12 integrate
.. //depot/projects/smpng/sys/dev/amr/amr.c#33 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_cam.c#14 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_compat.h#5 delete
.. //depot/projects/smpng/sys/dev/amr/amr_disk.c#17 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_pci.c#22 integrate
.. //depot/projects/smpng/sys/dev/amr/amrvar.h#19 integrate
.. //depot/projects/smpng/sys/dev/an/if_an.c#45 integrate
.. //depot/projects/smpng/sys/dev/an/if_an_isa.c#12 integrate
.. //depot/projects/smpng/sys/dev/ar/if_ar.c#19 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arl.c#9 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#71 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#38 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#54 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#52 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#29 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#32 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-raid.c#36 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#57 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#8 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#8 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#30 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athvar.h#19 integrate
.. //depot/projects/smpng/sys/dev/awi/awi.c#25 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#17 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#57 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#42 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissreg.h#11 integrate
.. //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#7 integrate
.. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#12 integrate
.. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#20 integrate
.. //depot/projects/smpng/sys/dev/cp/if_cp.c#13 integrate
.. //depot/projects/smpng/sys/dev/cs/if_cs.c#15 integrate
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#15 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#19 integrate
.. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#32 integrate
.. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#12 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.c#49 integrate
.. //depot/projects/smpng/sys/dev/en/if_en_pci.c#10 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#27 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep.c#24 integrate
.. //depot/projects/smpng/sys/dev/ep/if_epreg.h#7 integrate
.. //depot/projects/smpng/sys/dev/ex/if_ex.c#17 integrate
.. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#15 integrate
.. //depot/projects/smpng/sys/dev/fe/if_fe.c#20 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#19 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwdev.c#21 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#27 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#6 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#64 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#17 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#23 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#18 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#15 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#9 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#8 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#12 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#24 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#8 integrate
.. //depot/projects/smpng/sys/dev/ie/if_ie.c#13 integrate
.. //depot/projects/smpng/sys/dev/ieee488/upd7210.h#3 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#30 integrate
.. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#14 integrate
.. //depot/projects/smpng/sys/dev/iicbus/iicbus.h#2 integrate
.. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#6 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#34 integrate
.. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#8 integrate
.. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#10 integrate
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#28 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#19 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#66 integrate
.. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#11 integrate
.. //depot/projects/smpng/sys/dev/mly/mly.c#26 integrate
.. //depot/projects/smpng/sys/dev/mly/mlyvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt.c#9 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt.h#6 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_cam.h#2 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_raid.h#2 integrate
.. //depot/projects/smpng/sys/dev/my/if_my.c#20 integrate
.. //depot/projects/smpng/sys/dev/my/if_myreg.h#4 integrate
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#41 integrate
.. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#28 integrate
.. //depot/projects/smpng/sys/dev/nve/if_nve.c#5 integrate
.. //depot/projects/smpng/sys/dev/owi/if_owi.c#10 integrate
.. //depot/projects/smpng/sys/dev/owi/if_owi_pccard.c#6 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm.c#8 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_intr.c#6 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#8 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#9 integrate
.. //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#12 integrate
.. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#15 integrate
.. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#6 integrate
.. //depot/projects/smpng/sys/dev/ral/if_ral.c#8 integrate
.. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/ray/if_ray.c#21 integrate
.. //depot/projects/smpng/sys/dev/ray/if_rayvar.h#7 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#24 integrate
.. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#19 integrate
.. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#11 integrate
.. //depot/projects/smpng/sys/dev/smbus/smbus.h#2 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn.c#23 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#18 integrate
.. //depot/projects/smpng/sys/dev/sn/if_snvar.h#6 integrate
.. //depot/projects/smpng/sys/dev/snc/dp83932.c#14 integrate
.. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#8 integrate
.. //depot/projects/smpng/sys/dev/snp/snp.c#24 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#20 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ess.c#16 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/mss.c#24 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#16 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#26 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.h#3 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#22 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#26 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#14 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#30 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#26 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/fake.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#20 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#26 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#21 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#10 integrate
.. //depot/projects/smpng/sys/dev/sr/if_sr.c#20 integrate
.. //depot/projects/smpng/sys/dev/tx/if_tx.c#22 integrate
.. //depot/projects/smpng/sys/dev/txp/if_txp.c#26 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#7 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#37 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#21 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cdce.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cue.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/if_kue.c#26 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rue.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/if_udav.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/if_ural.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/ums.c#22 integrate
.. //depot/projects/smpng/sys/dev/vge/if_vge.c#8 integrate
.. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#8 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx.c#21 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#74 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#22 integrate
.. //depot/projects/smpng/sys/dev/wl/if_wl.c#25 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe.c#24 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#21 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs.h#14 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#18 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_int.h#1 branch
.. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#11 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#24 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#49 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#22 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#39 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union.h#12 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli.h#2 integrate
.. //depot/projects/smpng/sys/geom/geom_ctl.c#23 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.c#9 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.h#5 integrate
.. //depot/projects/smpng/sys/geom/label/g_label_ext2fs.c#1 branch
.. //depot/projects/smpng/sys/geom/label/g_label_reiserfs.c#1 branch
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#12 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#12 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#11 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#6 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#9 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#31 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#65 integrate
.. //depot/projects/smpng/sys/i386/cpufreq/est.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/db_trace.c#25 integrate
.. //depot/projects/smpng/sys/i386/i386/io_apic.c#12 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#84 integrate
.. //depot/projects/smpng/sys/i386/i386/ptrace_machdep.c#3 integrate
.. //depot/projects/smpng/sys/i386/i386/swtch.s#26 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/if_el.c#14 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#31 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#44 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#24 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#15 integrate
.. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#21 integrate
.. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#16 integrate
.. //depot/projects/smpng/sys/ia64/ia64/exception.S#10 integrate
.. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#30 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#95 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#30 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#71 integrate
.. //depot/projects/smpng/sys/ia64/ia64/sal.c#12 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#75 integrate
.. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#49 integrate
.. //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#12 integrate
.. //depot/projects/smpng/sys/ia64/include/param.h#16 integrate
.. //depot/projects/smpng/sys/ia64/include/proc.h#11 integrate
.. //depot/projects/smpng/sys/ia64/include/smp.h#8 integrate
.. //depot/projects/smpng/sys/isa/isa_common.c#17 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_conf.c#39 integrate
.. //depot/projects/smpng/sys/kern/kern_cpu.c#5 integrate
.. //depot/projects/smpng/sys/kern/kern_environment.c#18 integrate
.. //depot/projects/smpng/sys/kern/kern_lock.c#42 integrate
.. //depot/projects/smpng/sys/kern/kern_malloc.c#39 integrate
.. //depot/projects/smpng/sys/kern/kern_mib.c#27 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#102 integrate
.. //depot/projects/smpng/sys/kern/kern_pmc.c#3 integrate
.. //depot/projects/smpng/sys/kern/kern_poll.c#16 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#60 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#47 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#60 integrate
.. //depot/projects/smpng/sys/kern/subr_hints.c#9 integrate
.. //depot/projects/smpng/sys/kern/subr_kobj.c#6 integrate
.. //depot/projects/smpng/sys/kern/subr_stack.c#1 branch
.. //depot/projects/smpng/sys/kern/subr_witness.c#133 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#31 integrate
.. //depot/projects/smpng/sys/kern/tty_pty.c#41 integrate
.. //depot/projects/smpng/sys/kern/tty_tty.c#16 integrate
.. //depot/projects/smpng/sys/kern/uipc_mbuf.c#37 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#72 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#81 integrate
.. //depot/projects/smpng/sys/kern/vfs_cluster.c#40 integrate
.. //depot/projects/smpng/sys/kern/vfs_default.c#42 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#29 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#107 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#65 integrate
.. //depot/projects/smpng/sys/libkern/strcasecmp.c#1 branch
.. //depot/projects/smpng/sys/modules/Makefile#102 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_label/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/padlock/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/procfs/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/twa/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/twe/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/bpf.c#54 integrate
.. //depot/projects/smpng/sys/net/bridge.c#39 integrate
.. //depot/projects/smpng/sys/net/bridgestp.c#3 integrate
.. //depot/projects/smpng/sys/net/if.c#71 integrate
.. //depot/projects/smpng/sys/net/if.h#26 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#19 integrate
.. //depot/projects/smpng/sys/net/if_atm.h#13 integrate
.. //depot/projects/smpng/sys/net/if_atmsubr.c#20 integrate
.. //depot/projects/smpng/sys/net/if_bridge.c#6 integrate
.. //depot/projects/smpng/sys/net/if_ef.c#20 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#61 integrate
.. //depot/projects/smpng/sys/net/if_faith.c#28 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#25 integrate
.. //depot/projects/smpng/sys/net/if_fwsubr.c#8 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#28 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#24 integrate
.. //depot/projects/smpng/sys/net/if_iso88025subr.c#22 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#38 integrate
.. //depot/projects/smpng/sys/net/if_ppp.c#34 integrate
.. //depot/projects/smpng/sys/net/if_pppvar.h#10 integrate
.. //depot/projects/smpng/sys/net/if_spppsubr.c#27 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#37 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#44 integrate
.. //depot/projects/smpng/sys/net/if_var.h#40 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#37 integrate
.. //depot/projects/smpng/sys/net/ppp_tty.c#20 integrate
.. //depot/projects/smpng/sys/net/route.c#27 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#47 integrate
.. //depot/projects/smpng/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#15 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_acl.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#9 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto_tkip.c#4 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#5 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#6 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_input.c#23 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#19 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#9 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#20 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.h#15 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_output.c#18 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#14 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#9 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_var.h#14 integrate
.. //depot/projects/smpng/sys/netatm/atm_if.c#15 integrate
.. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#13 integrate
.. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/netgraph.h#21 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#22 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.c#25 integrate
.. //depot/projects/smpng/sys/netgraph/ng_fec.c#15 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#24 integrate
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_parse.c#16 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sppp.c#9 integrate
.. //depot/projects/smpng/sys/netinet/if_atm.c#9 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#36 integrate
.. //depot/projects/smpng/sys/netinet/igmp.c#15 integrate
.. //depot/projects/smpng/sys/netinet/in.c#27 integrate
.. //depot/projects/smpng/sys/netinet/in_proto.c#21 integrate
.. //depot/projects/smpng/sys/netinet/in_var.h#14 integrate
.. //depot/projects/smpng/sys/netinet/ip_carp.c#10 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#19 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#30 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#57 integrate
.. //depot/projects/smpng/sys/netinet/ip_gre.c#16 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#69 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#74 integrate
.. //depot/projects/smpng/sys/netinet/pim_var.h#3 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#71 integrate
.. //depot/projects/smpng/sys/netinet6/icmp6.c#31 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#27 integrate
.. //depot/projects/smpng/sys/netinet6/in6.h#17 integrate
.. //depot/projects/smpng/sys/netinet6/in6_proto.c#13 integrate
.. //depot/projects/smpng/sys/netinet6/in6_src.c#22 integrate
.. //depot/projects/smpng/sys/netinet6/in6_var.h#13 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_forward.c#15 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_fw.c#20 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#20 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_var.h#17 integrate
.. //depot/projects/smpng/sys/netinet6/mld6.c#13 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.c#27 integrate
.. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#17 integrate
.. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#14 integrate
.. //depot/projects/smpng/sys/netinet6/pim6_var.h#3 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#35 integrate
.. //depot/projects/smpng/sys/netkey/key.c#31 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#24 integrate
.. //depot/projects/smpng/sys/netsmb/smb_dev.c#19 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.c#18 integrate
.. //depot/projects/smpng/sys/opencrypto/xform.c#5 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#67 integrate
.. //depot/projects/smpng/sys/pci/if_dcreg.h#25 integrate
.. //depot/projects/smpng/sys/pci/if_de.c#27 integrate
.. //depot/projects/smpng/sys/pci/if_devar.h#10 integrate
.. //depot/projects/smpng/sys/pci/if_pcn.c#34 integrate
.. //depot/projects/smpng/sys/pci/if_pcnreg.h#6 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#56 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#25 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#36 integrate
.. //depot/projects/smpng/sys/pci/if_sfreg.h#8 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#52 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#48 integrate
.. //depot/projects/smpng/sys/pci/if_ste.c#37 integrate
.. //depot/projects/smpng/sys/pci/if_stereg.h#9 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#47 integrate
.. //depot/projects/smpng/sys/pci/if_tl.c#27 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#36 integrate
.. //depot/projects/smpng/sys/pci/if_wb.c#30 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#60 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#8 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#63 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#46 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#13 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#58 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#24 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#15 integrate
.. //depot/projects/smpng/sys/sys/ata.h#22 integrate
.. //depot/projects/smpng/sys/sys/buf.h#38 integrate
.. //depot/projects/smpng/sys/sys/conf.h#42 integrate
.. //depot/projects/smpng/sys/sys/interrupt.h#16 integrate
.. //depot/projects/smpng/sys/sys/kobj.h#4 integrate
.. //depot/projects/smpng/sys/sys/libkern.h#19 integrate
.. //depot/projects/smpng/sys/sys/lockmgr.h#15 integrate
.. //depot/projects/smpng/sys/sys/mac_policy.h#33 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#52 integrate
.. //depot/projects/smpng/sys/sys/mount.h#42 integrate
.. //depot/projects/smpng/sys/sys/mutex.h#60 integrate
.. //depot/projects/smpng/sys/sys/param.h#85 integrate
.. //depot/projects/smpng/sys/sys/pmckern.h#4 integrate
.. //depot/projects/smpng/sys/sys/proc.h#147 integrate
.. //depot/projects/smpng/sys/sys/protosw.h#14 integrate
.. //depot/projects/smpng/sys/sys/queue.h#13 integrate
.. //depot/projects/smpng/sys/sys/shm.h#9 integrate
.. //depot/projects/smpng/sys/sys/soundcard.h#10 integrate
.. //depot/projects/smpng/sys/sys/stack.h#1 branch
.. //depot/projects/smpng/sys/sys/vnode.h#65 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#46 integrate
.. //depot/projects/smpng/sys/ufs/ffs/softdep.h#6 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#22 integrate
.. //depot/projects/smpng/sys/vm/uma_int.h#29 integrate
.. //depot/projects/smpng/sys/vm/vm_contig.c#32 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#71 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#64 integrate
.. //depot/projects/smpng/sys/vm/vm_page.h#30 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#53 integrate
.. //depot/projects/smpng/sys/vm/vm_pager.c#23 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#54 integrate

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#17 (text+ko) ====

@@ -42,12 +42,14 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.23 2004/11/27 06:51:32 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.24 2005/08/03 04:27:38 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kdb.h>
+#include <sys/linker.h>
 #include <sys/proc.h>
+#include <sys/stack.h>
 #include <sys/sysent.h>
 
 #include <machine/db_machdep.h>
@@ -348,6 +350,45 @@
 		    count));
 }
 
+void
+stack_save(struct stack *st)
+{
+	struct prologue_info pi;
+	linker_symval_t symval;
+	c_linker_sym_t sym;
+	vm_offset_t callpc, frame;
+	long offset;
+	register_t pc, sp;
+
+	stack_zero(st);
+	__asm __volatile(
+		"	mov $30,%0 \n"
+		"	lda %1,1f \n"
+		"1:\n"
+		: "=r" (sp), "=r" (pc));
+	callpc = (vm_offset_t)pc;
+	frame = (vm_offset_t)sp;
+	while (1) {
+		/*
+		 * search_symbol/symbol_values are slow
+		 */
+		if (linker_ddb_search_symbol((caddr_t)callpc, &sym, &offset) != 0)
+			break;
+		if (linker_ddb_symbol_values(sym, &symval) != 0)
+			break;
+		if (callpc < (vm_offset_t)symval.value)
+			break;
+		if (stack_put(st, callpc) == -1)
+			break;
+		if (decode_prologue(callpc, (db_addr_t)symval.value, &pi))
+			break;
+		if ((pi.pi_regmask & (1 << 26)) == 0)
+			break;
+		callpc = *(vm_offset_t *)(frame + pi.pi_reg_offset[26]);
+		frame += pi.pi_frame_size;
+	}
+}
+
 int
 db_md_set_watchpoint(addr, size)
 	db_expr_t addr;

==== //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.8 2004/07/11 03:07:28 marcel Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.9 2005/08/06 19:24:22 marcel Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
@@ -32,3 +32,10 @@
 hint.sio.1.flags="0x80"
 hint.ppc.0.at="isa"
 hint.ppc.0.irq="7"
+hint.uart.0.at="isa"
+hint.uart.0.irq="4"
+hint.uart.0.port="0x3F8"
+hint.uart.1.at="isa"
+hint.uart.1.flags="0x80"
+hint.uart.1.irq="3"
+hint.uart.1.port="0x2F8"

==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#20 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.94 2005/01/29 23:11:57 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.95 2005/07/29 19:40:38 jhb Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"

==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#13 (text+ko) ====

@@ -25,12 +25,13 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.66 2005/01/21 05:54:05 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.68 2005/08/03 04:33:48 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kdb.h>
 #include <sys/proc.h>
+#include <sys/stack.h>
 #include <sys/sysent.h>
 
 #include <machine/cpu.h>
@@ -178,7 +179,8 @@
 /*
  * Stack trace.
  */
-#define	INKERNEL(va)	(((vm_offset_t)(va)) >= USRSTACK)
+#define	INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) < DMAP_MAX_ADDRESS) \
+	    || (va) >= KERNBASE)
 
 struct amd64_frame {
 	struct amd64_frame	*f_frame;
@@ -494,6 +496,28 @@
 		    ctx->pcb_rip, count));
 }
 
+void
+stack_save(struct stack *st)
+{
+	struct amd64_frame *frame;
+	vm_offset_t callpc;
+	register_t rbp;
+
+	stack_zero(st);
+	__asm __volatile("movq %%rbp,%0" : "=r" (rbp));
+	frame = (struct amd64_frame *)rbp;
+	while (1) {
+		if (!INKERNEL((long)frame))
+			break;
+		callpc = frame->f_retaddr;
+		if (!INKERNEL(callpc))
+			break;
+		if (stack_put(st, callpc) == -1)
+			break;
+		frame = frame->f_frame;
+	}
+}
+
 int
 amd64_set_watch(watchnum, watchaddr, size, access, d)
 	int watchnum;

==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#43 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.516 2005/06/10 03:33:35 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.521 2005/08/14 20:02:49 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -104,7 +104,6 @@
  */
 
 #include "opt_msgbuf.h"
-#include "opt_kstack_pages.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -207,8 +206,8 @@
 static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq,
 		vm_offset_t sva, pd_entry_t ptepde);
 static void pmap_remove_page(struct pmap *pmap, vm_offset_t va);
-static int pmap_remove_entry(struct pmap *pmap, vm_page_t m,
-		vm_offset_t va, pd_entry_t ptepde);
+static void pmap_remove_entry(struct pmap *pmap, vm_page_t m,
+		vm_offset_t va);
 static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m);
 
 static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags);
@@ -1420,11 +1419,10 @@
 }
 
 
-static int
-pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va, pd_entry_t ptepde)
+static void
+pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va)
 {
 	pv_entry_t pv;
-	int rtval;
 
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
@@ -1439,20 +1437,13 @@
 				break;
 		}
 	}
-
-	rtval = 0;
-	if (pv) {
-		rtval = pmap_unuse_pt(pmap, va, ptepde);
-		TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
-		m->md.pv_list_count--;
-		if (TAILQ_FIRST(&m->md.pv_list) == NULL)
-			vm_page_flag_clear(m, PG_WRITEABLE);
-
-		TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist);
-		free_pv_entry(pv);
-	}
-			
-	return rtval;
+	KASSERT(pv != NULL, ("pmap_remove_entry: pv not found"));
+	TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
+	m->md.pv_list_count--;
+	if (TAILQ_EMPTY(&m->md.pv_list))
+		vm_page_flag_clear(m, PG_WRITEABLE);
+	TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist);
+	free_pv_entry(pv);
 }
 
 /*
@@ -1510,10 +1501,9 @@
 		}
 		if (oldpte & PG_A)
 			vm_page_flag_set(m, PG_REFERENCED);
-		return pmap_remove_entry(pmap, m, va, ptepde);
-	} else {
-		return pmap_unuse_pt(pmap, va, ptepde);
+		pmap_remove_entry(pmap, m, va);
 	}
+	return (pmap_unuse_pt(pmap, va, ptepde));
 }
 
 /*
@@ -1763,7 +1753,6 @@
 		 */
 		if ((ptpaddr & PG_PS) != 0) {
 			*pde &= ~(PG_M|PG_RW);
-			pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
 			anychanged = 1;
 			continue;
 		}
@@ -1831,7 +1820,6 @@
 	vm_paddr_t pa;
 	register pt_entry_t *pte;
 	vm_paddr_t opa;
-	pd_entry_t ptepde;
 	pt_entry_t origpte, newpte;
 	vm_page_t mpte, om;
 
@@ -1866,7 +1854,7 @@
 	}
 #endif
 
-	pte = pmap_pte_pde(pmap, va, &ptepde);
+	pte = pmap_pte(pmap, va);
 
 	/*
 	 * Page Directory table entry not valid, we need a new PT page
@@ -1926,23 +1914,23 @@
 	 * handle validating new mapping.
 	 */
 	if (opa) {
-		int err;
 		if (origpte & PG_W)
 			pmap->pm_stats.wired_count--;
 		if (origpte & PG_MANAGED) {
 			om = PHYS_TO_VM_PAGE(opa);
-			err = pmap_remove_entry(pmap, om, va, ptepde);
-		} else
-			err = pmap_unuse_pt(pmap, va, ptepde);
-		if (err)
-			panic("pmap_enter: pte vanished, va: 0x%lx", va);
+			pmap_remove_entry(pmap, om, va);
+		}
+		if (mpte != NULL) {
+			mpte->wire_count--;
+			KASSERT(mpte->wire_count > 0,
+			    ("pmap_enter: missing reference to page table page,"
+			     " va: 0x%lx", va));
+		}
 	} else
 		pmap->pm_stats.resident_count++;
 
 	/*
-	 * Enter on the PV list if part of our managed memory. Note that we
-	 * raise IPL while manipulating pv_table since pmap_enter can be
-	 * called at interrupt time.
+	 * Enter on the PV list if part of our managed memory.
 	 */
 	if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) {
 		pmap_insert_entry(pmap, va, m);
@@ -2567,12 +2555,6 @@
 		 */
 		if (!pmap_track_modified(pv->pv_va))
 			continue;
-#if defined(PMAP_DIAGNOSTIC)
-		if (!pv->pv_pmap) {
-			printf("Null pmap (tb) at va: 0x%lx\n", pv->pv_va);
-			continue;
-		}
-#endif
 		PMAP_LOCK(pv->pv_pmap);
 		pte = pmap_pte(pv->pv_pmap, pv->pv_va);
 		rv = (*pte & PG_M) != 0;
@@ -2634,13 +2616,6 @@
 				continue;
 		}
 
-#if defined(PMAP_DIAGNOSTIC)
-		if (!pv->pv_pmap) {
-			printf("Null pmap (cb) at va: 0x%lx\n", pv->pv_va);
-			continue;
-		}
-#endif
-
 		PMAP_LOCK(pv->pv_pmap);
 		pte = pmap_pte(pv->pv_pmap, pv->pv_va);
 retry:

==== //depot/projects/smpng/sys/amd64/include/atomic.h#25 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.36 2005/07/21 22:35:02 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.37 2005/08/18 14:36:47 jhb Exp $
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_

==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.7 2005/03/23 08:27:58 das Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.8 2005/07/29 19:40:38 jhb Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"

==== //depot/projects/smpng/sys/arm/arm/db_trace.c#12 (text+ko) ====

@@ -30,13 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.10 2005/01/05 21:58:47 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.11 2005/08/03 04:27:38 jeff Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 
 
 #include <sys/proc.h>
 #include <sys/kdb.h>
+#include <sys/stack.h>
 #include <machine/armreg.h>
 #include <machine/asm.h>
 #include <machine/cpufunc.h>
@@ -219,3 +220,21 @@
 {
 	db_trace_thread(curthread, -1);
 }
+
+void
+stack_save(struct stack *st)
+{
+	vm_offset_t callpc;
+	u_int32_t *frame;
+
+	stack_zero(st);
+	frame = (u_int32_t *)__builtin_frame_address(0);
+	while (1) {
+		if (!INKERNEL(frame))
+			break;
+		callpc = frame[FR_SCP];
+		if (stack_put(st, callpc) == -1)
+			break;
+		frame = (u_int32_t *)(frame[FR_RFP]);
+	}
+}

==== //depot/projects/smpng/sys/boot/common/loader.8#37 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.82 2005/06/14 08:49:14 ru Exp $
+.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.83 2005/08/18 01:39:43 iedowse Exp $
 .\"
-.Dd May 27, 2005
+.Dd August 18, 2005
 .Dt LOADER 8
 .Os
 .Sh NAME
@@ -392,6 +392,19 @@
 List of semicolon-separated search path for bootable kernels.
 The default is
 .Dq Li kernel .
+.It Va comconsole_speed
+Defines the speed of the serial console (i386 and amd64 only).
+If the previous boot stage indicated that a serial console is in use
+then this variable is initialized to the current speed of the console
+serial port.
+Otherwise it is set to 9600 unless this was overridden using the
+.Va BOOT_COMCONSOLE_SPEED
+variable when
+.Nm
+was compiled.
+Changes to the
+.Va comconsole_speed
+variable take effect immediately.
 .It Va console
 Defines the current console or consoles.
 Multiple consoles may be specified.

==== //depot/projects/smpng/sys/boot/forth/loader.conf#36 (text+ko) ====

@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.96 2005/07/29 12:41:37 brian Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.99 2005/08/18 01:39:43 iedowse Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -47,6 +47,7 @@
 				# allowed to interrupt autoboot process and
 				# escape to the loader prompt
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
+#comconsole_speed="9600"	# Set the current serial console speed
 #console="vidconsole"		# A comma separated list of console(s)
 #currdev="disk1s1a"		# Set the current device
 module_path="/boot/modules"	# Set the module search path
@@ -91,7 +92,7 @@
 #kern.maxswzone=""		# Set the max swmeta KVA storage
 #kern.maxtsiz=""		# Set the max text size
 #kern.maxusers="32"		# Set size of various static tables
-#kern.nbuf=""			# Set the number of buffer headers 
+#kern.nbuf=""			# Set the number of buffer headers
 #kern.ncallout=""		# Set the maximum # of timer events
 #kern.sgrowsiz=""		# Set the amount to grow stack
 #kern.cam.scsi_delay="2000"	# Delay (in ms) before probing SCSI
@@ -184,10 +185,16 @@
 miibus_load="NO"		# miibus support, needed for some drivers
 if_an_load="NO"			# Aironet 4500/4800 802.11 wireless NICs
 if_ar_load="NO"			# Digi SYNC/570i
+if_arl_load="NO"		# Aironet Arlan 655 wireless network adapter
+if_ath_load="NO"		# Atheros IEEE 802.11 wireless NICs
+if_aue_load="NO"		# ADMtek AN986 Pegasus USB Ethernet
 if_awi_load="NO"		# AMD PCnetMobile IEEE 802.11 wireless NICs
+if_axe_load="NO"		# ASIX Electronics AX88172 USB Ethernet
 if_bfe_load="NO"		# Broadcom BCM4401
 if_bge_load="NO"		# Broadcom BCM570x PCI gigabit ethernet
 if_cm_load="NO"			# SMC (90c26, 90c56, 90c66)
+if_cs_load="NO"			# Crystal Semiconductor CS8920
+if_cue_load="NO"		# CATC USB-EL1210A USB Ethernet
 if_dc_load="NO"			# DEC/Intel 21143 and various workalikes
 if_de_load="NO"			# DEC DC21x4x ethernet
 if_ed_load="NO"			# National Semiconductor DS8390/WD83C690 ethernet
@@ -199,16 +206,19 @@
 if_fe_load="NO"			# Fujitsu MB86960A/MB86965A based Ethernet adapters
 if_fxp_load="NO"		# Intel EtherExpress PRO/100B (82557, 82558)
 if_gx_load="NO"			# Intel Pro/1000 gigabit ethernet
+if_hme_load="NO"		#  Sun Microelectronics STP2002-STQ Ethernet
 if_ie_load="NO"			# Intel 82586
 if_lge_load="NO"		# Level 1 LXT1001 NetCellerator PCI gigabit ethernet
 if_lnc_load="NO"		# AMD Lance/PCnet Ethernet
 if_my_load="NO"			# Myson PCI fast ethernet
 if_nge_load="NO"		# National Semiconductor PCI gigabit ethernet
+if_nve_load="NO"		# NVIDIA nForce MCP Networking Adapter
 if_oltr_load="NO"		# Olicom
 if_pcn_load="NO"		# AMD PCnet PCI
 if_ray_load="NO"		# Raytheon Raylink/Webgear Aviator PCCard
 if_re_load="NO"			# RealTek 8139C+/8169/8169S/8110S
 if_rl_load="NO"			# RealTek 8129/8139
+if_rue_load="NO"		# RealTek RTL8150 USB to Fast Ethernet
 if_sbni_load="NO"		# Granch SBNI12 leased line adapters
 if_sf_load="NO"			# Adaptec Duralink PCI (AIC-6915 "starfire")
 if_sis_load="NO"		# Silicon Integrated Systems SiS 900/7016
@@ -221,6 +231,7 @@
 if_tx_load="NO"			# SMC 83c17x fast ethernet
 if_txp_load="NO"		# 3Com 3XP Typhoon/Sidewinder (3CR990)
 if_vge_load="NO"		# VIA VT6122 PCI Gigabit Ethernet
+if_udav_load="NO"		# Davicom DM9601 USB Ethernet
 if_vr_load="NO"			# VIA Rhine I and Rhine II
 if_vx_load="NO"			# 3Com 3C590 family
 if_wb_load="NO"			# Winbond W89C840F

==== //depot/projects/smpng/sys/boot/forth/loader.conf.5#10 (text+ko) ====

@@ -22,8 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.23 2004/11/07 17:01:08 krion Exp $
-.Dd November 7, 2004
+.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.24 2005/08/18 01:39:43 iedowse Exp $
+.Dd August 18, 2005
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -164,6 +164,18 @@
 .Pq Dq Pa /boot/splash.bmp
 Name of the bitmap to be loaded.
 Any other name can be used.
+.It Va comconsole_speed
+.Po Dq 9600
+or the value of the
+.Va BOOT_COMCONSOLE_SPEED
+variable when
+.Xr loader 8
+was compiled
+.Pc .
+Sets the speed of the serial console.
+If the previous boot loader stage specified that a serial console
+is in use then the default speed is determined from the current
+serial port speed setting.
 .It Va console
 .Pq Dq vidconsole
 .Dq comconsole

==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#26 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.72 2005/05/27 19:26:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.74 2005/08/18 00:42:45 iedowse Exp $");
 
 #include <sys/param.h>
 #include <sys/disklabel.h>
@@ -63,7 +63,6 @@
 #define RBX_NOINTR	0x1c	/* -n */
 /* 0x1d is reserved for log2(RB_MULTIPLE) and is just misnamed here. */
 #define RBX_DUAL	0x1d	/* -D */
-#define RBX_PROBEKBD	0x1e	/* -P */
 /* 0x1f is reserved for log2(RB_BOOTINFO). */
 
 /* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */
@@ -71,7 +70,7 @@
 
 #define PATH_CONFIG	"/boot.config"
 #define PATH_BOOT3	"/boot/loader"
-#define PATH_KERNEL	"/kernel"
+#define PATH_KERNEL	"/boot/kernel/kernel"
 
 #define ARGS		0x900
 #define NOPT		12
@@ -91,7 +90,7 @@
 
 extern uint32_t _end;

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list