From owner-p4-projects@FreeBSD.ORG Tue Mar 16 09:38:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DC1D16A4D0; Tue, 16 Mar 2004 09:38:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C81816A4CE for ; Tue, 16 Mar 2004 09:38:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 421CA43D2F for ; Tue, 16 Mar 2004 09:38:01 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2GHc1Ge093673 for ; Tue, 16 Mar 2004 09:38:01 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2GHbuGu093666 for perforce@freebsd.org; Tue, 16 Mar 2004 09:37:56 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 16 Mar 2004 09:37:56 -0800 (PST) Message-Id: <200403161737.i2GHbuGu093666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 49097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 17:38:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=49097 Change 49097 by jhb@jhb_slimer on 2004/03/16 09:37:40 IFC @49096. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#21 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#11 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#9 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#9 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#10 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#7 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/syscalls.master#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/smpng/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/smpng/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/smpng/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#11 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#21 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#7 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#21 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#17 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/smpng/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/smpng/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/smpng/sys/conf/NOTES#64 integrate .. //depot/projects/smpng/sys/conf/files#106 integrate .. //depot/projects/smpng/sys/conf/files.i386#56 integrate .. //depot/projects/smpng/sys/conf/files.pc98#54 integrate .. //depot/projects/smpng/sys/conf/kern.mk#11 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#31 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#29 integrate .. //depot/projects/smpng/sys/conf/options#72 integrate .. //depot/projects/smpng/sys/conf/options.amd64#7 integrate .. //depot/projects/smpng/sys/conf/options.i386#41 integrate .. //depot/projects/smpng/sys/conf/options.pc98#38 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#7 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#37 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/smpng/sys/dev/ata/ata-all.c#49 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#32 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#41 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#11 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#40 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#15 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/smpng/sys/dev/ct/bshw_machdep.c#4 integrate .. //depot/projects/smpng/sys/dev/ct/ct.c#5 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#19 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#14 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#8 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#10 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#48 integrate .. //depot/projects/smpng/sys/dev/gx/if_gx.c#14 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#6 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#9 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#21 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#19 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#13 integrate .. //depot/projects/smpng/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/smpng/sys/dev/md/md.c#47 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#3 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#15 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#6 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500hw.h#2 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#29 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#18 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp.c#7 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#5 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_acctrace.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_acctrace.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_alloclist.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_alloclist.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_archs.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_aselect.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_aselect.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_bsd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_callback.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_callback.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_chaindecluster.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_chaindecluster.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_configure.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_copyback.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_copyback.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_cvscan.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_cvscan.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dag.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegrd.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegrd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegwr.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagdegwr.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffrd.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffrd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffwr.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagffwr.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagflags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagfuncs.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagfuncs.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagutils.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_dagutils.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugMem.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugMem.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugprint.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_debugprint.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_decluster.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_decluster.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_declusterPQ.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_declusterPQ.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_desc.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_diskqueue.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_diskqueue.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_disks.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_disks.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_driver.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_driver.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_engine.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_engine.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_etimer.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dagfuncs.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dags.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_evenodd_dags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_fifo.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_fifo.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#14 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_freelist.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_general.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_geniq.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_hist.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_interdecluster.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_interdecluster.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_invertq.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_invertq.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_kintf.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_layout.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_layout.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_map.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_map.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_mcpair.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_mcpair.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_memchunk.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_memchunk.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_nwayxor.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_nwayxor.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_options.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_options.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_optnames.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylog.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylog.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogDiskMgr.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogging.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylogging.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityloggingdags.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityloggingdags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityscan.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_parityscan.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pq.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pq.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdeg.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdeg.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdegdags.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_pqdegdags.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_psstatus.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_psstatus.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid0.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid0.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid1.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid1.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid4.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid4.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5_rotatedspare.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_raidframe.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconbuffer.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconbuffer.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconmap.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconmap.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconstruct.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconstruct.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconutil.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_reconutil.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_revent.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_revent.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_shutdown.c#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_shutdown.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_sstf.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_sstf.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_states.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_states.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_stripelocks.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_stripelocks.h#2 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_strutils.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_threadstuff.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_threadstuff.h#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_types.h#4 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_utils.c#3 delete .. //depot/projects/smpng/sys/dev/raidframe/rf_utils.h#2 delete .. //depot/projects/smpng/sys/dev/re/if_re.c#7 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#13 integrate .. //depot/projects/smpng/sys/dev/scd/scdreg.h#3 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#14 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#8 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#15 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#7 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#16 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#48 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#48 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#10 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#20 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#18 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#14 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#17 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#28 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#17 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#39 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#12 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#30 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#19 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#23 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#47 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#79 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#26 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/in_cksum.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#68 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#49 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#5 integrate .. //depot/projects/smpng/sys/i386/include/asc_ioctl.h#2 delete .. //depot/projects/smpng/sys/i386/include/atomic.h#12 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#10 integrate .. //depot/projects/smpng/sys/i386/include/cdk.h#2 delete .. //depot/projects/smpng/sys/i386/include/cpufunc.h#26 integrate .. //depot/projects/smpng/sys/i386/include/critical.h#7 integrate .. //depot/projects/smpng/sys/i386/include/dvcfg.h#3 delete .. //depot/projects/smpng/sys/i386/include/endian.h#13 integrate .. //depot/projects/smpng/sys/i386/include/gsc.h#2 delete .. //depot/projects/smpng/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/smpng/sys/i386/include/in_cksum.h#5 integrate .. //depot/projects/smpng/sys/i386/include/ioctl_bt848.h#3 integrate .. //depot/projects/smpng/sys/i386/include/ioctl_ctx.h#2 delete .. //depot/projects/smpng/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#11 integrate .. //depot/projects/smpng/sys/i386/include/physio_proc.h#5 delete .. //depot/projects/smpng/sys/i386/include/profile.h#9 integrate .. //depot/projects/smpng/sys/i386/include/spigot.h#2 delete .. //depot/projects/smpng/sys/i386/include/stdarg.h#9 integrate .. //depot/projects/smpng/sys/i386/include/wtio.h#2 delete .. //depot/projects/smpng/sys/i386/isa/README.le#2 delete .. //depot/projects/smpng/sys/i386/isa/README.stl#2 delete .. //depot/projects/smpng/sys/i386/isa/asc.c#9 delete .. //depot/projects/smpng/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/ctx.c#9 delete .. //depot/projects/smpng/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/gpib.c#10 delete .. //depot/projects/smpng/sys/i386/isa/gpib.h#2 delete .. //depot/projects/smpng/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/gsc.c#8 delete .. //depot/projects/smpng/sys/i386/isa/gscreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/ic/am7990.h#2 delete .. //depot/projects/smpng/sys/i386/isa/ic/lemac.h#3 delete .. //depot/projects/smpng/sys/i386/isa/if_el.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/if_le.c#13 delete .. //depot/projects/smpng/sys/i386/isa/if_rdp.c#11 delete .. //depot/projects/smpng/sys/i386/isa/if_rdpreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/isa_compat.c#6 delete .. //depot/projects/smpng/sys/i386/isa/isa_device.h#5 delete .. //depot/projects/smpng/sys/i386/isa/istallion.c#12 delete .. //depot/projects/smpng/sys/i386/isa/npx.c#39 integrate .. //depot/projects/smpng/sys/i386/isa/pcf.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#16 delete .. //depot/projects/smpng/sys/i386/isa/stallion.c#14 delete .. //depot/projects/smpng/sys/i386/isa/wt.c#10 delete .. //depot/projects/smpng/sys/i386/isa/wtreg.h#3 delete .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#15 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#20 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#79 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#24 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#53 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#63 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#32 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#34 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#41 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#42 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#71 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#70 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#43 integrate .. //depot/projects/smpng/sys/libkern/quad.h#5 integrate .. //depot/projects/smpng/sys/modules/Makefile#72 integrate .. //depot/projects/smpng/sys/modules/arl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/i2c/controllers/pcf/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/raidframe/Makefile#3 delete .. //depot/projects/smpng/sys/net/if.c#45 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#44 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#15 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_tap.c#25 integrate .. //depot/projects/smpng/sys/net/if_tapvar.h#4 integrate .. //depot/projects/smpng/sys/net/if_tun.c#30 integrate .. //depot/projects/smpng/sys/net/if_var.h#22 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#10 integrate .. //depot/projects/smpng/sys/netatm/atm_ioctl.h#5 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#22 integrate .. //depot/projects/smpng/sys/netncp/ncp_subr.c#6 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#24 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#11 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#31 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#41 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#7 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#23 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#23 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#14 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#52 integrate .. //depot/projects/smpng/sys/pci/if_de.c#14 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#23 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#45 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#25 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#38 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#29 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#27 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#35 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#20 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#23 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#22 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#41 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#15 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.h#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#23 integrate .. //depot/projects/smpng/sys/sys/assym.h#2 integrate .. //depot/projects/smpng/sys/sys/ata.h#17 integrate .. //depot/projects/smpng/sys/sys/buf.h#26 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#23 integrate .. //depot/projects/smpng/sys/sys/conf.h#25 integrate .. //depot/projects/smpng/sys/sys/dir.h#2 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#20 integrate .. //depot/projects/smpng/sys/sys/ioctl.h#3 integrate .. //depot/projects/smpng/sys/sys/limits.h#6 integrate .. //depot/projects/smpng/sys/sys/linker_set.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#26 integrate .. //depot/projects/smpng/sys/sys/param.h#59 integrate .. //depot/projects/smpng/sys/sys/queue.h#9 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/smpng/sys/sys/socket.h#18 integrate .. //depot/projects/smpng/sys/sys/syscall.h#41 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#41 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#27 integrate .. //depot/projects/smpng/sys/sys/syslimits.h#7 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#43 integrate .. //depot/projects/smpng/sys/sys/vnode.h#42 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#31 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#34 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#22 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#40 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#25 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#42 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -458,9 +458,7 @@ if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/smpng/sys/alpha/linux/linux_proto.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.15 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.16 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.13 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.14 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.13 2004/02/04 22:00:41 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.14 2004/03/15 22:44:35 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp */ #include "opt_compat.h" @@ -24,7 +24,7 @@ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ { 0, (sy_call_t *)nosys }, /* 5 = */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ - { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys }, /* 8 = */ { AS(linux_link_args), (sy_call_t *)linux_link }, /* 9 = linux_link */ { AS(linux_unlink_args), (sy_call_t *)linux_unlink }, /* 10 = linux_unlink */ ==== //depot/projects/smpng/sys/alpha/linux/syscalls.master#10 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -43,7 +43,7 @@ 4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } 5 UNIMPL 6 MNOPROTO { int close(int fd); } -7 STD { int osf1_wait4(int pid, int *status, int options, \ +7 MSTD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } 8 UNIMPL 9 STD { int linux_link(char *path, char *to); } ==== //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.9 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.10 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #ifndef _OSF1_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.8 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.9 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #define OSF1_SYS_nosys 0 ==== //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.8 2004/02/04 22:00:41 jhb Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.9 2004/03/15 22:44:35 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp */ #include "opt_compat.h" @@ -25,7 +25,7 @@ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ { 0, (sy_call_t *)nosys }, /* 5 = old open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ - { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys }, /* 8 = old creat */ { AS(link_args), (sy_call_t *)link }, /* 9 = link */ { AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ ==== //depot/projects/smpng/sys/alpha/osf1/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp $ +; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from OSF1). @@ -37,7 +37,7 @@ 4 MNOPROTO { ssize_t write(int fd, char *buf, ssize_t nbyte); } 5 UNIMPL old open 6 MNOPROTO { int close(int fd); } -7 STD { int osf1_wait4(int pid, int *status, int options, \ +7 MSTD { int osf1_wait4(int pid, int *status, int options, \ struct osf1_rusage *rusage); } 8 UNIMPL old creat 9 NOPROTO { int link(char *path, char *link); } ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.54 2003/09/22 23:11:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.55 2004/03/13 15:42:59 scottl Exp $"); #include #include @@ -453,9 +453,7 @@ && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.273 2004/03/08 00:17:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); /* * AMD64 Trap and System call handling @@ -629,10 +629,6 @@ printf("Idle\n"); } -#ifdef KDB - if (kdb_trap(&psl)) - return; -#endif #ifdef DDB if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame)) return; @@ -758,13 +754,6 @@ ktrsyscall(code, narg, argp); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -773,7 +762,12 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - error = (*callp->sy_call)(td, argp); + if ((callp->sy_narg & SYF_MPSAFE) == 0) { + mtx_lock(&Giant); + error = (*callp->sy_call)(td, argp); + mtx_unlock(&Giant); + } else + error = (*callp->sy_call)(td, argp); } switch (error) { @@ -811,12 +805,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#14 (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.403 2004/02/02 00:54:59 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.404 2004/03/15 00:49:39 obrien Exp $ machine amd64 cpu HAMMER @@ -188,7 +188,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/smpng/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # # We don't have modules on amd64. @@ -17,7 +17,7 @@ machine amd64 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. #XXX#profile 2 @@ -231,17 +231,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) - #XXX#device ath #XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -477,7 +477,7 @@ # (whether static or dynamic). # #XXX#options COMPAT_SVR4 # build emulator statically -options DEBUG_SVR4 # enable verbose debugging +#XXX#options DEBUG_SVR4 # enable verbose debugging #XXX#device streams # STREAMS network driver (required for svr4). ==== //depot/projects/smpng/sys/amd64/include/cpufunc.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.141 2004/03/08 00:24:15 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.142 2004/03/11 13:38:54 bde Exp $ */ /* @@ -119,6 +119,8 @@ __asm __volatile("sti"); } +#ifdef _KERNEL + #define HAVE_INLINE_FFS static __inline int @@ -162,6 +164,8 @@ return (mask == 0 ? mask : (int)bsrq((u_long)mask) + 1); } +#endif /* _KERNEL */ + static __inline void halt(void) { ==== //depot/projects/smpng/sys/amd64/include/pci_cfgreg.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $ * */ @@ -45,4 +45,3 @@ int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); -int pci_cfgintr(int bus, int device, int pin, int oldirq); ==== //depot/projects/smpng/sys/amd64/pci/pci_bus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); #include "opt_cpu.h" @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -42,9 +41,6 @@ #include #include #include -#include -#include -#include #include "pcib_if.h" @@ -88,210 +84,10 @@ u_int8_t *busnum) { const char *s = NULL; - static u_int8_t pxb[4]; /* hack for 450nx */ *busnum = 0; - - switch (id) { - case 0x12258086: - s = "Intel 824?? host to PCI bridge"; - /* XXX This is a guess */ - /* *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x41, 1); */ - *busnum = bus; - break; - case 0x71208086: - s = "Intel 82810 (i810 GMCH) Host To Hub bridge"; - break; - case 0x71228086: - s = "Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge"; - break; - case 0x71248086: - s = "Intel 82810E (i810E GMCH) Host To Hub bridge"; - break; - case 0x11308086: - s = "Intel 82815 (i815 GMCH) Host To Hub bridge"; - break; - case 0x71808086: - s = "Intel 82443LX (440 LX) host to PCI bridge"; - break; - case 0x71908086: - s = "Intel 82443BX (440 BX) host to PCI bridge"; - break; - case 0x71928086: - s = "Intel 82443BX host to PCI bridge (AGP disabled)"; - break; - case 0x71948086: - s = "Intel 82443MX host to PCI bridge"; - break; - case 0x71a08086: - s = "Intel 82443GX host to PCI bridge"; - break; - case 0x71a18086: - s = "Intel 82443GX host to AGP bridge"; - break; - case 0x71a28086: - s = "Intel 82443GX host to PCI bridge (AGP disabled)"; - break; - case 0x84c48086: - s = "Intel 82454KX/GX (Orion) host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x4a, 1); - break; - case 0x84ca8086: - /* - * For the 450nx chipset, there is a whole bundle of - * things pretending to be host bridges. The MIOC will - * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to - * read the registers of the MIOC to figure out the - * bus numbers for the PXB channels. - * - * Since the MIOC doesn't have a pci bus attached, we - * pretend it wasn't there. - */ - pxb[0] = legacy_pcib_read_config(0, bus, slot, func, - 0xd0, 1); /* BUSNO[0] */ - pxb[1] = legacy_pcib_read_config(0, bus, slot, func, - 0xd1, 1) + 1; /* SUBA[0]+1 */ - pxb[2] = legacy_pcib_read_config(0, bus, slot, func, - 0xd3, 1); /* BUSNO[1] */ - pxb[3] = legacy_pcib_read_config(0, bus, slot, func, - 0xd4, 1) + 1; /* SUBA[1]+1 */ - return NULL; - case 0x84cb8086: - switch (slot) { - case 0x12: - s = "Intel 82454NX PXB#0, Bus#A"; - *busnum = pxb[0]; - break; - case 0x13: - s = "Intel 82454NX PXB#0, Bus#B"; - *busnum = pxb[1]; - break; - case 0x14: - s = "Intel 82454NX PXB#1, Bus#A"; - *busnum = pxb[2]; - break; - case 0x15: - s = "Intel 82454NX PXB#1, Bus#B"; - *busnum = pxb[3]; - break; - } - break; - - /* AMD -- vendor 0x1022 */ - case 0x30001022: - s = "AMD Elan SC520 host to PCI bridge"; -#ifdef CPU_ELAN - init_AMD_Elan_sc520(); -#else - printf( -"*** WARNING: missing CPU_ELAN -- timekeeping may be wrong\n"); -#endif - break; - case 0x70061022: - s = "AMD-751 host to PCI bridge"; - break; - case 0x700e1022: - s = "AMD-761 host to PCI bridge"; - break; - - /* SiS -- vendor 0x1039 */ - case 0x04961039: - s = "SiS 85c496"; - break; - case 0x04061039: - s = "SiS 85c501"; - break; - case 0x06011039: - s = "SiS 85c601"; - break; - case 0x55911039: - s = "SiS 5591 host to PCI bridge"; - break; - case 0x00011039: - s = "SiS 5591 host to AGP bridge"; - break; - - /* VLSI -- vendor 0x1004 */ - case 0x00051004: - s = "VLSI 82C592 Host to PCI bridge"; - break; - - /* XXX Here is MVP3, I got the datasheet but NO M/B to test it */ - /* totally. Please let me know if anything wrong. -F */ - /* XXX need info on the MVP3 -- any takers? */ - case 0x05981106: - s = "VIA 82C598MVP (Apollo MVP3) host bridge"; - break; - - /* AcerLabs -- vendor 0x10b9 */ - /* Funny : The datasheet told me vendor id is "10b8",sub-vendor */ - /* id is '10b9" but the register always shows "10b9". -Foxfair */ - case 0x154110b9: - s = "AcerLabs M1541 (Aladdin-V) PCI host bridge"; - break; - - /* OPTi -- vendor 0x1045 */ - case 0xc7011045: - s = "OPTi 82C700 host to PCI bridge"; - break; - case 0xc8221045: - s = "OPTi 82C822 host to PCI Bridge"; - break; - - /* ServerWorks -- vendor 0x1166 */ - case 0x00051166: - s = "ServerWorks NB6536 2.0HE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00061166: - /* FALLTHROUGH */ - case 0x00081166: - /* FALLTHROUGH */ - case 0x02011166: - /* FALLTHROUGH */ - case 0x010f1014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - >>> TRUNCATED FOR MAIL (1000 lines) <<<