Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Mar 2004 11:31:28 -0800 (PST)
From:      John Baldwin <jhb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 49731 for review
Message-ID:  <200403261931.i2QJVSor073671@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49731

Change 49731 by jhb@jhb_slimer on 2004/03/26 11:30:53

	IFC @49729.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#26 integrate
.. //depot/projects/smpng/sys/alpha/alpha/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#31 integrate
.. //depot/projects/smpng/sys/alpha/include/_types.h#4 integrate
.. //depot/projects/smpng/sys/alpha/isa/isa.c#12 integrate
.. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#26 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#15 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#15 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/smpng/sys/amd64/include/_types.h#3 integrate
.. //depot/projects/smpng/sys/amd64/isa/atpic.c#5 integrate
.. //depot/projects/smpng/sys/amd64/isa/isa.c#4 integrate
.. //depot/projects/smpng/sys/arm/include/_types.h#3 integrate
.. //depot/projects/smpng/sys/boot/alpha/common/conf.c#4 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.s#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot0ext/Makefile#1 branch
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#7 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#9 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#46 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#12 integrate
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#7 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#13 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#11 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#31 integrate
.. //depot/projects/smpng/sys/conf/NOTES#65 integrate
.. //depot/projects/smpng/sys/conf/files#107 integrate
.. //depot/projects/smpng/sys/conf/files.alpha#27 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#14 integrate
.. //depot/projects/smpng/sys/conf/files.i386#57 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#38 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#55 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#19 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#36 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#35 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#32 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#19 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#18 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#19 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#8 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#3 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.h#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#29 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#10 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#62 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#22 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#25 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#20 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#15 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#14 integrate
.. //depot/projects/smpng/sys/dev/adlink/adlink.c#8 integrate
.. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#6 integrate
.. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#6 integrate
.. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/aha/aha_isa.c#9 integrate
.. //depot/projects/smpng/sys/dev/aha/aha_mca.c#7 integrate
.. //depot/projects/smpng/sys/dev/ahb/ahb.c#10 integrate
.. //depot/projects/smpng/sys/dev/aic/aic_cbus.c#4 integrate
.. //depot/projects/smpng/sys/dev/aic/aic_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#7 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#11 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#17 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#15 integrate
.. //depot/projects/smpng/sys/dev/amd/amd.c#11 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_pci.c#13 integrate
.. //depot/projects/smpng/sys/dev/an/if_an.c#38 integrate
.. //depot/projects/smpng/sys/dev/ar/if_ar.c#12 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arl.c#2 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#2 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/asr/asr.c#23 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#50 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#9 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#33 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#42 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#16 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/awi/awi.c#17 integrate
.. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#11 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#6 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#41 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#21 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#7 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#6 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#6 integrate
.. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#19 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#28 integrate
.. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#9 integrate
.. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#16 integrate
.. //depot/projects/smpng/sys/dev/cs/if_cs.c#8 integrate
.. //depot/projects/smpng/sys/dev/ct/ct_isa.c#9 integrate
.. //depot/projects/smpng/sys/dev/digi/digi_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#6 integrate
.. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#11 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_irq.h#3 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#20 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.c#31 integrate
.. //depot/projects/smpng/sys/dev/en/if_en_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep.c#15 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#8 integrate
.. //depot/projects/smpng/sys/dev/ex/if_ex.c#9 integrate
.. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#9 integrate
.. //depot/projects/smpng/sys/dev/fb/s3_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/fe/if_fe.c#11 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwdev.c#16 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#25 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#49 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#17 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#10 integrate
.. //depot/projects/smpng/sys/dev/gx/if_gx.c#15 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#13 integrate
.. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#6 integrate
.. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#15 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#14 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#10 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#7 integrate
.. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#8 integrate
.. //depot/projects/smpng/sys/dev/ida/ida_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/idt/idt_pci.c#3 integrate
.. //depot/projects/smpng/sys/dev/ie/if_ie.c#10 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#12 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/iir/iir.h#8 integrate
.. //depot/projects/smpng/sys/dev/iir/iir_pci.c#11 integrate
.. //depot/projects/smpng/sys/dev/ips/ips.h#7 integrate
.. //depot/projects/smpng/sys/dev/ips/ips_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_pci.c#23 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#8 integrate
.. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#7 integrate
.. //depot/projects/smpng/sys/dev/joy/joy.c#8 integrate
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#20 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#6 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#6 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/matcd/matcd_isa.c#3 integrate
.. //depot/projects/smpng/sys/dev/mcd/mcd_isa.c#5 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#48 integrate
.. //depot/projects/smpng/sys/dev/mlx/mlx.c#15 integrate
.. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/mly/mly.c#22 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/musycc/musycc.c#8 integrate
.. //depot/projects/smpng/sys/dev/my/if_my.c#16 integrate
.. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#13 integrate
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#30 integrate
.. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#10 integrate
.. //depot/projects/smpng/sys/dev/owi/if_owi.c#6 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#5 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccard.c#27 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#36 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#36 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#41 integrate
.. //depot/projects/smpng/sys/dev/pci/isa_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/pcic/i82365.c#9 integrate
.. //depot/projects/smpng/sys/dev/pcic/i82365_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/pdq/if_fea.c#8 integrate
.. //depot/projects/smpng/sys/dev/pdq/if_fpa.c#8 integrate
.. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#10 integrate
.. //depot/projects/smpng/sys/dev/ppbus/lpbb.c#5 integrate
.. //depot/projects/smpng/sys/dev/ppbus/lpt.c#9 integrate
.. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#9 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppi.c#9 integrate
.. //depot/projects/smpng/sys/dev/ppbus/pps.c#13 integrate
.. //depot/projects/smpng/sys/dev/ppbus/vpo.c#8 integrate
.. //depot/projects/smpng/sys/dev/ppc/ppc.c#3 integrate
.. //depot/projects/smpng/sys/dev/pst/pst-pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/puc/puc.c#17 integrate
.. //depot/projects/smpng/sys/dev/ray/if_ray.c#12 integrate
.. //depot/projects/smpng/sys/dev/rc/rc.c#9 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#8 integrate
.. //depot/projects/smpng/sys/dev/rp/rp_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/sab/sab.c#16 integrate
.. //depot/projects/smpng/sys/dev/safe/safe.c#5 integrate
.. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#9 integrate
.. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#6 integrate
.. //depot/projects/smpng/sys/dev/scd/scd_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/si/si_eisa.c#3 integrate
.. //depot/projects/smpng/sys/dev/si/si_isa.c#5 integrate
.. //depot/projects/smpng/sys/dev/si/si_pci.c#3 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#40 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn.c#15 integrate
.. //depot/projects/smpng/sys/dev/snc/if_snc.c#4 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#13 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/ess.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#3 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/mpu.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/mss.c#15 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#7 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#19 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csa.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#8 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#13 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ich.c#26 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#7 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/solo.c#10 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#16 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#16 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#10 integrate
.. //depot/projects/smpng/sys/dev/sr/if_sr.c#13 integrate
.. //depot/projects/smpng/sys/dev/stg/tmc18c30_subr.c#3 integrate
.. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#17 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#37 integrate
.. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#16 integrate
.. //depot/projects/smpng/sys/dev/trm/trm.c#16 integrate
.. //depot/projects/smpng/sys/dev/twe/twe.c#10 integrate
.. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#20 integrate
.. //depot/projects/smpng/sys/dev/twe/twevar.h#7 integrate
.. //depot/projects/smpng/sys/dev/tx/if_tx.c#17 integrate
.. //depot/projects/smpng/sys/dev/txp/if_txp.c#19 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_core.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_alpha.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#3 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_subr.c#1 branch
.. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/ehcireg.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/uftdi.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_subr.c#19 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#49 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#49 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#49 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumobj.h#6 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#16 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#9 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#7 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#61 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#27 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#18 integrate
.. //depot/projects/smpng/sys/dev/wl/if_wl.c#18 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe.c#16 integrate
.. //depot/projects/smpng/sys/dev/zs/zs_macio.c#3 integrate
.. //depot/projects/smpng/sys/dev/zs/zs_sbus.c#4 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#40 integrate
.. //depot/projects/smpng/sys/i386/bios/smapi.c#6 integrate
.. //depot/projects/smpng/sys/i386/bios/smbios.c#3 integrate
.. //depot/projects/smpng/sys/i386/bios/vpd.c#3 integrate
.. //depot/projects/smpng/sys/i386/i386/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#50 integrate
.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#14 integrate
.. //depot/projects/smpng/sys/i386/include/_types.h#6 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic.c#5 integrate
.. //depot/projects/smpng/sys/i386/isa/ic/scd1400.h#2 delete
.. //depot/projects/smpng/sys/i386/isa/if_el.c#10 integrate
.. //depot/projects/smpng/sys/i386/isa/isa.c#6 integrate
.. //depot/projects/smpng/sys/i386/isa/mse.c#11 integrate
.. //depot/projects/smpng/sys/i386/isa/spic.c#10 integrate
.. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#9 integrate
.. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#10 integrate
.. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#11 integrate
.. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#12 integrate
.. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#8 integrate
.. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#5 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_ctx_s0P.c#6 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_drn_ngo.c#4 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#5 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#7 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#6 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#5 integrate
.. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_usr_sti.c#4 integrate
.. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#12 integrate
.. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#7 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC.hints#6 integrate
.. //depot/projects/smpng/sys/ia64/ia64/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#38 integrate
.. //depot/projects/smpng/sys/ia64/include/_types.h#6 integrate
.. //depot/projects/smpng/sys/ia64/include/cpufunc.h#20 integrate
.. //depot/projects/smpng/sys/ia64/include/reg.h#10 integrate
.. //depot/projects/smpng/sys/ia64/isa/isa.c#3 integrate
.. //depot/projects/smpng/sys/isa/atkbd_isa.c#8 integrate
.. //depot/projects/smpng/sys/isa/atkbdc_isa.c#8 integrate
.. //depot/projects/smpng/sys/isa/fd.c#31 integrate
.. //depot/projects/smpng/sys/isa/isa_common.c#13 integrate
.. //depot/projects/smpng/sys/isa/orm.c#4 integrate
.. //depot/projects/smpng/sys/isa/psm.c#22 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#32 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#75 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#60 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#54 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#27 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#32 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#114 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#35 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#26 integrate
.. //depot/projects/smpng/sys/kern/uipc_cow.c#15 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#32 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#49 integrate
.. //depot/projects/smpng/sys/modules/Makefile#73 integrate
.. //depot/projects/smpng/sys/modules/arl/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/netgraph/sppp/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/uart/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#12 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#19 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#15 integrate
.. //depot/projects/smpng/sys/net/if_gre.h#7 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#26 integrate
.. //depot/projects/smpng/sys/net/if_tapvar.h#5 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#31 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#7 integrate
.. //depot/projects/smpng/sys/netatalk/aarp.c#11 integrate
.. //depot/projects/smpng/sys/netatalk/at_control.c#9 integrate
.. //depot/projects/smpng/sys/netatalk/at_rmx.c#2 integrate
.. //depot/projects/smpng/sys/netatalk/at_var.h#3 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_input.c#9 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_output.c#6 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#1 branch
.. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#1 branch
.. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#18 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_var.h#2 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sppp.c#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_sppp.h#1 branch
.. //depot/projects/smpng/sys/netgraph/ng_tee.c#9 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#23 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#43 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#27 integrate
.. //depot/projects/smpng/sys/netinet/ip_gre.c#12 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#54 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs.h#16 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#22 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#17 integrate
.. //depot/projects/smpng/sys/pc98/pc98/canbus.c#2 integrate
.. //depot/projects/smpng/sys/pc98/pc98/fd.c#30 integrate
.. //depot/projects/smpng/sys/pc98/pc98/mse.c#9 integrate
.. //depot/projects/smpng/sys/pc98/pc98/olpt.c#9 integrate
.. //depot/projects/smpng/sys/pc98/pc98/pc98kbd.c#5 integrate
.. //depot/projects/smpng/sys/pc98/pc98/ppc.c#7 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#37 integrate
.. //depot/projects/smpng/sys/pccard/mecia.c#4 integrate
.. //depot/projects/smpng/sys/pccard/pcic_pci.c#31 integrate
.. //depot/projects/smpng/sys/pci/agp.c#19 integrate
.. //depot/projects/smpng/sys/pci/agp_amd.c#11 integrate
.. //depot/projects/smpng/sys/pci/agp_i810.c#13 integrate
.. //depot/projects/smpng/sys/pci/alpm.c#8 integrate
.. //depot/projects/smpng/sys/pci/amdpm.c#10 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#53 integrate
.. //depot/projects/smpng/sys/pci/if_de.c#15 integrate
.. //depot/projects/smpng/sys/pci/if_mn.c#9 integrate
.. //depot/projects/smpng/sys/pci/if_pcn.c#24 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#46 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#26 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#39 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#30 integrate
.. //depot/projects/smpng/sys/pci/if_ste.c#28 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#36 integrate
.. //depot/projects/smpng/sys/pci/if_tl.c#21 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#24 integrate
.. //depot/projects/smpng/sys/pci/if_wb.c#23 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#42 integrate
.. //depot/projects/smpng/sys/pci/intpm.c#9 integrate
.. //depot/projects/smpng/sys/pci/ncr.c#14 integrate
.. //depot/projects/smpng/sys/pci/viapm.c#6 integrate
.. //depot/projects/smpng/sys/pci/xrpu.c#13 integrate
.. //depot/projects/smpng/sys/powerpc/include/_types.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#33 integrate
.. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/smpng/sys/rpc/rpcclnt.c#5 integrate
.. //depot/projects/smpng/sys/sparc64/include/_types.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/isa/isa.c#10 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#21 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/uio_machdep.c#1 branch
.. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#39 integrate
.. //depot/projects/smpng/sys/sys/bus.h#14 integrate
.. //depot/projects/smpng/sys/sys/param.h#60 integrate
.. //depot/projects/smpng/sys/sys/sf_buf.h#3 integrate
.. //depot/projects/smpng/sys/sys/tree.h#2 integrate
.. //depot/projects/smpng/sys/sys/types.h#24 integrate
.. //depot/projects/smpng/sys/sys/uio.h#17 integrate
.. //depot/projects/smpng/sys/sys/wait.h#6 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#25 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#58 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#43 integrate

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#26 (text+ko) ====

@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.76 2003/11/17 06:10:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.77 2004/03/23 22:28:16 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#31 (text+ko) ====

@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.100 2004/03/16 19:04:27 alc Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -437,27 +437,12 @@
 }
 
 /*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
  */
 void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
 {
-	struct sf_buf *sf;
-	struct vm_page *m;
 
-	sf = args;
-	m = sf->m;
-	vm_page_lock_queues();
-	vm_page_unwire(m, 0);
-	/*
-	 * Check for the object going away on us. This can
-	 * happen since we don't hold a reference to it.
-	 * If so, we're responsible for freeing the page.
-	 */
-	if (m->wire_count == 0 && m->object == NULL)
-		vm_page_free(m);
-	vm_page_unlock_queues();
-	sf->m = NULL;
 	mtx_lock(&sf_freelist.sf_lock);
 	SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
 	nsfbufsused--;

==== //depot/projects/smpng/sys/alpha/include/_types.h#4 (text+ko) ====

@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $
+ * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
@@ -55,6 +55,7 @@
  * Standard type definitions.
  */
 typedef	__int32_t	__clock_t;		/* clock()... */
+typedef	unsigned int	__cpumask_t;
 typedef	__int64_t	__critical_t;
 typedef	double		__double_t;
 typedef	float		__float_t;

==== //depot/projects/smpng/sys/alpha/isa/isa.c#12 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.34 2003/11/17 06:10:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -169,9 +169,7 @@
 		   u_long start, u_long end, u_long count, u_int flags)
 {
 	/*
-	 * Consider adding a resource definition. We allow rid 0-1 for
-	 * irq and drq, 0-3 for memory and 0-7 for ports which is
-	 * sufficient for isapnp.
+	 * Consider adding a resource definition.
 	 */
 	int passthrough = (device_get_parent(child) != bus);
 	int isdefault = (start == 0UL && end == ~0UL);

==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#26 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.45 2004/02/04 21:52:52 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.46 2004/03/17 19:59:59 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,6 +68,7 @@
 #include <sys/user.h>
 #include <sys/utsname.h>
 #include <sys/vnode.h>
+#include <sys/wait.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -1376,27 +1377,23 @@
 	struct thread *td;
 	struct osf1_wait4_args *uap;
 {
-	int error;
-	caddr_t sg;
-	struct osf1_rusage *orusage, oru;
-	struct rusage *rusage = NULL, ru;
+	int error, status;
+	struct osf1_rusage oru;
+	struct rusage ru;
 
-	orusage = uap->rusage;
-	if (orusage) {
-		sg = stackgap_init();
-		rusage = stackgap_alloc(&sg, sizeof(struct rusage));
-		uap->rusage = (struct osf1_rusage *)rusage;
-	}
-	if ((error = wait4(td, (struct wait_args *)uap)))
-		return error;
-	if (orusage && (error = copyin(rusage, &ru, sizeof(ru)) == 0)){
+	error = kern_wait(td, uap->pid, &status, uap->options, &ru);
+	if (error)
+		return (error);
+	if (uap->status != NULL)
+		error = copyout(&status, uap->status, sizeof(status));
+	if (uap->rusage != NULL && error == 0) {
 		TV_CP(ru.ru_utime, oru.ru_utime);
 		TV_CP(ru.ru_stime, oru.ru_stime);
 		bcopy(&ru.ru_first, &oru.ru_first,
 		    (&(oru.ru_last) - &(oru.ru_first)));
-		copyout(&oru, orusage, sizeof (struct osf1_rusage));
+		error = copyout(&oru, uap->rusage, sizeof (struct osf1_rusage));
 	}
-	return (0);
+	return (error);
 }
 
 

==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#8 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.129 2004/03/06 00:51:30 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.130 2004/03/25 03:38:31 peter Exp $");
 
 #include "opt_cpu.h"
 
@@ -73,6 +73,7 @@
 static void print_AMD_info(void);
 static void print_AMD_assoc(int i);
 
+int	cpu_feature2;		/* XXX change cpu_feature to long? */
 int	cpu_class;
 u_int	cpu_exthigh;		/* Highest arg to extended CPUID */
 char machine[] = "amd64";
@@ -218,6 +219,44 @@
 			"\040PBE"	/* Pending Break Enable */
 			);
 
+			if (cpu_feature2 != 0) {
+				printf("\n  Features2=0x%b", cpu_feature2,
+				"\020"
+				"\001SSE3"	/* SSE3 */
+				"\002<b1>"
+				"\003RSVD2>"	/* "Reserved" bit 2 */
+				"\004MON"	/* MONITOR/MWAIT Instructions */
+				"\005DS_CPL"	/* CPL Qualified Debug Store */
+				"\006<b5>"	/* Machine specific registers */
+				"\007<b6>"	/* Physical address extension */
+				"\010EST"	/* Enhanced SpeedStep */
+				"\011TM2"	/* Thermal Monitor 2 */
+				"\012<b9>"
+				"\013CNTX-ID"	/* L1 context ID available */
+				"\014<b11>"
+				"\015<b12>"
+				"\016CX16"	/* CMPXCHG16B Instruction */
+				"\017<b14>"
+				"\020<b15>"
+				"\021<b16>"
+				"\022<b17>"
+				"\023<b18>"
+				"\024<b19>"
+				"\025<b20>"
+				"\026<b21>"
+				"\027<b22>"
+				"\030<b23>"
+				"\031<b24>"
+				"\032<b25>"
+				"\033<b26>"
+				"\034<b27>"
+				"\035<b28>"
+				"\036<b29>"
+				"\037<b30>"
+				"\040<b31>"
+				);
+			}
+
 			/*
 			 * If this CPU supports hyperthreading then mention
 			 * the number of logical CPU's it contains.
@@ -227,10 +266,8 @@
 				printf("\n  Hyperthreading: %d logical CPUs",
 				    (cpu_procinfo & CPUID_HTT_CORES) >> 16);
 		}
-		if (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
-		    cpu_exthigh >= 0x80000001)
+		if (cpu_exthigh >= 0x80000001)
 			print_AMD_features();
-	} else if (strcmp(cpu_vendor, "CyrixInstead") == 0) {
 	}
 	/* Avoid ugly blank lines: only print newline when we have to. */
 	if (*cpu_vendor || cpu_id)
@@ -285,6 +322,7 @@
 	cpu_id = regs[0];
 	cpu_procinfo = regs[1];
 	cpu_feature = regs[3];
+	cpu_feature2 = regs[2];
 
 	/* XXX */
 	cpu = CPU_CLAWHAMMER;
@@ -339,7 +377,7 @@
 	 * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf
 	 */
 	do_cpuid(0x80000001, regs);
-	printf("\n  AMD Features=0x%b", regs[3] &~ cpu_feature,
+	printf("\n  AMD Features=0x%b", regs[3] & ~(cpu_feature & 0x0183f3ff),
 		"\020"		/* in hex */
 		"\001FPU"	/* Integral FPU */
 		"\002VME"	/* Extended VM86 mode support */
@@ -356,7 +394,7 @@
 		"\015MTRR"	/* Memory Type Range Registers */
 		"\016PGE"	/* PG_G (global bit) support */
 		"\017MCA"	/* Machine Check Architecture */
-		"\020ICMOV"	/* CMOV instruction */
+		"\020CMOV"	/* CMOV instruction */
 		"\021PAT"	/* Page attributes table */
 		"\022PGE36"	/* 36 bit address space support */
 		"\023RSVD"	/* Reserved, unknown */

==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.235 2004/03/08 00:25:03 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.236 2004/03/18 02:53:38 obrien Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -1016,7 +1016,8 @@
 	return (error);
 }
 SYSCTL_PROC(_machdep, OID_AUTO, hlt_cpus, CTLTYPE_INT|CTLFLAG_RW,
-    0, 0, sysctl_hlt_cpus, "IU", "");
+    0, 0, sysctl_hlt_cpus, "IU",
+    "Bitmap of CPUs to halt.  101 (binary) will halt CPUs 0 and 2.");
 
 static int
 sysctl_hlt_logical_cpus(SYSCTL_HANDLER_ARGS)

==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#15 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.228 2004/01/28 23:58:55 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.230 2004/03/25 03:39:38 peter Exp $");
 
 #include "opt_isa.h"
 #include "opt_kstack_pages.h"
@@ -124,7 +124,8 @@
 	fpuexit(td1);
 
 	/* Point the pcb to the top of the stack */
-	pcb2 = (struct pcb *)(td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+	pcb2 = (struct pcb *)(td2->td_kstack +
+	    td2->td_kstack_pages * PAGE_SIZE) - 1;
 	td2->td_pcb = pcb2;
 
 	/* Copy p1's pcb */
@@ -247,8 +248,8 @@
 cpu_thread_setup(struct thread *td)
 {
 
-	td->td_pcb =
-	     (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+	td->td_pcb = (struct pcb *)(td->td_kstack +
+	    td->td_kstack_pages * PAGE_SIZE) - 1;
 	td->td_frame = (struct trapframe *)td->td_pcb - 1;
 }
 
@@ -490,27 +491,12 @@
 }
 
 /*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
  */
 void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
 {
-	struct sf_buf *sf;
-	struct vm_page *m;
 
-	sf = args;
-	m = sf->m;
-	vm_page_lock_queues();
-	vm_page_unwire(m, 0);
-	/*
-	 * Check for the object going away on us. This can
-	 * happen since we don't hold a reference to it.
-	 * If so, we're responsible for freeing the page.
-	 */
-	if (m->wire_count == 0 && m->object == NULL)
-		vm_page_free(m);
-	vm_page_unlock_queues();
-	sf->m = NULL;
 	mtx_lock(&sf_freelist.sf_lock);
 	SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
 	nsfbufsused--;

==== //depot/projects/smpng/sys/amd64/conf/GENERIC#15 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.404 2004/03/15 00:49:39 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.405 2004/03/25 03:19:28 obrien Exp $
 
 machine		amd64
 cpu		HAMMER
@@ -39,6 +39,7 @@
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NTFS			# NT File System
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.12 2003/05/01 01:05:22 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.14 2004/03/19 03:28:38 obrien Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
@@ -7,20 +7,6 @@
 hint.fd.0.drive="0"
 hint.fd.1.at="fdc0"
 hint.fd.1.drive="1"
-hint.ata.0.at="isa"
-hint.ata.0.port="0x1F0"
-hint.ata.0.irq="14"
-hint.ata.1.at="isa"
-hint.ata.1.port="0x170"
-hint.ata.1.irq="15"
-hint.adv.0.at="isa"
-hint.adv.0.disabled="1"
-hint.bt.0.at="isa"
-hint.bt.0.disabled="1"
-hint.aha.0.at="isa"
-hint.aha.0.disabled="1"
-hint.aic.0.at="isa"
-hint.aic.0.disabled="1"
 hint.atkbdc.0.at="isa"
 hint.atkbdc.0.port="0x060"
 hint.atkbd.0.at="atkbdc"
@@ -31,8 +17,6 @@
 hint.vga.0.at="isa"
 hint.sc.0.at="isa"
 hint.sc.0.flags="0x100"
-hint.vt.0.at="isa"
-hint.vt.0.disabled="1"
 hint.pcic.0.at="isa"
 # hint.pcic.0.irq="10"	# Default to polling
 hint.pcic.0.port="0x3e0"
@@ -59,33 +43,3 @@
 hint.sio.3.irq="9"
 hint.ppc.0.at="isa"
 hint.ppc.0.irq="7"
-hint.ed.0.at="isa"
-hint.ed.0.disabled="1"
-hint.ed.0.port="0x280"
-hint.ed.0.irq="10"
-hint.ed.0.maddr="0xd8000"
-hint.cs.0.at="isa"
-hint.cs.0.disabled="1"
-hint.cs.0.port="0x300"
-hint.sn.0.at="isa"
-hint.sn.0.disabled="1"
-hint.sn.0.port="0x300"
-hint.sn.0.irq="10"
-hint.ie.0.at="isa"
-hint.ie.0.disabled="1"
-hint.ie.0.port="0x300"
-hint.ie.0.irq="10"
-hint.ie.0.maddr="0xd0000"
-hint.fe.0.at="isa"
-hint.fe.0.disabled="1"
-hint.fe.0.port="0x300"
-hint.le.0.at="isa"
-hint.le.0.disabled="1"
-hint.le.0.port="0x300"
-hint.le.0.irq="5"
-hint.le.0.maddr="0xd0000"
-hint.lnc.0.at="isa"
-hint.lnc.0.disabled="1"
-hint.lnc.0.port="0x280"
-hint.lnc.0.irq="10"
-hint.lnc.0.drq="0"

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

@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/amd64/include/_types.h,v 1.5 2003/05/10 00:55:15 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/_types.h,v 1.6 2004/03/20 20:41:39 marcel Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
@@ -55,6 +55,7 @@
  * Standard type definitions.
  */
 typedef	__int32_t	__clock_t;		/* clock()... */
+typedef	unsigned int	__cpumask_t;
 typedef	__int64_t	__critical_t;
 typedef	double		__double_t;
 typedef	double		__float_t;

==== //depot/projects/smpng/sys/amd64/isa/atpic.c#5 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.9 2004/01/28 23:46:48 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.10 2004/03/17 17:50:23 njl Exp $");
 
 #include "opt_auto_eoi.h"
 #include "opt_isa.h"
@@ -392,7 +392,7 @@
 
 	/* Try to allocate our IRQ and then free it. */
 	rid = 0;
-	res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 0);
+	res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 0);
 	if (res != NULL)
 		bus_release_resource(dev, SYS_RES_IRQ, rid, res);
 	return (0);

==== //depot/projects/smpng/sys/amd64/isa/isa.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.145 2003/11/21 03:02:00 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.146 2004/03/17 21:45:55 jmg Exp $");
 
 /*
  * Modifications for Intel architecture by Garrett A. Wollman.
@@ -86,9 +86,7 @@
 		   u_long start, u_long end, u_long count, u_int flags)
 {
 	/*
-	 * Consider adding a resource definition. We allow rid 0-1 for
-	 * irq and drq, 0-3 for memory and 0-7 for ports which is
-	 * sufficient for isapnp.
+	 * Consider adding a resource definition.
 	 */
 	int passthrough = (device_get_parent(child) != bus);
 	int isdefault = (start == 0UL && end == ~0UL);

==== //depot/projects/smpng/sys/arm/include/_types.h#3 (text+ko) ====

@@ -33,7 +33,7 @@
  *
  *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
  *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $
  */
 
 #ifndef _MACHINE__TYPES_H_
@@ -63,6 +63,7 @@
  * Standard type definitions.
  */
 typedef	__uint32_t	__clock_t;		/* clock()... */
+typedef	unsigned int	__cpumask_t;
 typedef	__int32_t	__critical_t;
 typedef	__int32_t	__intfptr_t;
 typedef	__int64_t	__intmax_t;

==== //depot/projects/smpng/sys/boot/alpha/common/conf.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.5 2004/01/04 23:21:01 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.6 2004/03/25 20:36:57 jhb Exp $");
 
 #include <stand.h>
 #include "libalpha/libalpha.h"
@@ -67,6 +67,7 @@
     &nfs_fsops,
 #endif
     &gzipfs_fsops,
+    &splitfs_fsops,
     NULL
 };
 

==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403261931.i2QJVSor073671>