From owner-p4-projects@FreeBSD.ORG Fri May 8 11:53:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FFF71065673; Fri, 8 May 2009 11:53:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EC33106566C for ; Fri, 8 May 2009 11:53:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4BBFF8FC1D for ; Fri, 8 May 2009 11:53:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n48BrvBx016726 for ; Fri, 8 May 2009 11:53:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n48Brt3l016724 for perforce@freebsd.org; Fri, 8 May 2009 11:53:55 GMT (envelope-from jhb@freebsd.org) Date: Fri, 8 May 2009 11:53:55 GMT Message-Id: <200905081153.n48Brt3l016724@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 Cc: Subject: PERFORCE change 161766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2009 11:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=161766 Change 161766 by jhb@jhb_fiver on 2009/05/08 11:53:25 IFC @161762 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#32 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#33 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#40 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#55 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#12 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#76 integrate .. //depot/projects/smpng/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#22 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#13 integrate .. //depot/projects/smpng/sys/amd64/include/metadata.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#22 integrate .. //depot/projects/smpng/sys/amd64/include/pc/bios.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/pcpu.h#13 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#20 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#20 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#27 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#39 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#30 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#18 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#48 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#18 integrate .. //depot/projects/smpng/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/at91rm92reg.h#7 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#9 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA.hints#5 integrate .. //depot/projects/smpng/sys/arm/conf/BWCT#8 integrate .. //depot/projects/smpng/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#3 integrate .. //depot/projects/smpng/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/smpng/sys/arm/include/param.h#11 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#26 integrate .. //depot/projects/smpng/sys/arm/mv/common.c#4 integrate .. //depot/projects/smpng/sys/arm/mv/gpio.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/ic.c#2 integrate .. //depot/projects/smpng/sys/arm/mv/mv_pci.c#4 integrate .. //depot/projects/smpng/sys/arm/mv/mvreg.h#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biossmap.c#8 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/smpng/sys/bsm/audit.h#14 integrate .. //depot/projects/smpng/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/smpng/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/smpng/sys/bsm/audit_kevents.h#15 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#33 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#21 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#3 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vnode.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#58 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#52 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#52 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#52 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#52 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#56 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#13 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.h#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.h#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#56 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#18 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#96 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#45 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.h#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#43 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#19 integrate .. //depot/projects/smpng/sys/conf/NOTES#166 integrate .. //depot/projects/smpng/sys/conf/files#237 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#50 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#63 integrate .. //depot/projects/smpng/sys/conf/options#166 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#17 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#28 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#112 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#45 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#24 delete .. //depot/projects/smpng/sys/dev/ar/if_ar.h#3 delete .. //depot/projects/smpng/sys/dev/ar/if_ar_isa.c#8 delete .. //depot/projects/smpng/sys/dev/ar/if_ar_pci.c#8 delete .. //depot/projects/smpng/sys/dev/ar/if_arregs.h#5 delete .. //depot/projects/smpng/sys/dev/ata/ata-all.h#63 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#72 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#74 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#64 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#49 integrate .. //depot/projects/smpng/sys/dev/ata/ata-sata.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#42 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#7 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ati.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/ah_osdep.h#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#75 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#7 integrate .. //depot/projects/smpng/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/smpng/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/smpng/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/smpng/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/smpng/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/smpng/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/smpng/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/smpng/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/smpng/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/smpng/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#16 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#15 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.h#4 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#43 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#20 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#19 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#48 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#17 integrate .. //depot/projects/smpng/sys/dev/fb/creator.c#15 integrate .. //depot/projects/smpng/sys/dev/fb/machfb.c#7 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#57 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#24 integrate .. //depot/projects/smpng/sys/dev/iicbus/ds133x.c#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/ds1672.c#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#20 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#20 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipwvar.h#8 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#31 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwivar.h#11 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#21 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.h#8 integrate .. //depot/projects/smpng/sys/dev/mge/if_mge.c#3 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#22 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#34 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#9 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#27 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#14 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#19 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#67 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#32 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#25 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#29 delete .. //depot/projects/smpng/sys/dev/ray/if_raydbg.h#4 delete .. //depot/projects/smpng/sys/dev/ray/if_raymib.h#4 delete .. //depot/projects/smpng/sys/dev/ray/if_rayreg.h#3 delete .. //depot/projects/smpng/sys/dev/ray/if_rayvar.h#9 delete .. //depot/projects/smpng/sys/dev/re/if_re.c#74 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#25 integrate .. //depot/projects/smpng/sys/dev/rp/rp_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/rp/rpreg.h#5 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#53 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#25 delete .. //depot/projects/smpng/sys/dev/sr/if_sr.h#3 delete .. //depot/projects/smpng/sys/dev/sr/if_sr_isa.c#7 delete .. //depot/projects/smpng/sys/dev/sr/if_sr_pci.c#9 delete .. //depot/projects/smpng/sys/dev/sr/if_srregs.h#5 delete .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#26 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecreg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_controller.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#134 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/usb_wlan.h#3 delete .. //depot/projects/smpng/sys/dev/wi/if_wi.c#92 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#28 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#9 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#3 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/smpng/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/smpng/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/smpng/sys/geom/part/g_part.c#20 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#8 integrate .. //depot/projects/smpng/sys/geom/part/g_part_if.m#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#20 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#15 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#17 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rename.c#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#16 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#17 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#13 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#17 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#14 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#107 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#51 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#65 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#62 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#119 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#32 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#20 integrate .. //depot/projects/smpng/sys/i386/include/metadata.h#3 integrate .. //depot/projects/smpng/sys/i386/include/param.h#21 integrate .. //depot/projects/smpng/sys/i386/include/pc/bios.h#8 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#29 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#24 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#59 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#26 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#68 integrate .. //depot/projects/smpng/sys/i386/xen/clock.c#7 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#32 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#21 integrate .. //depot/projects/smpng/sys/ia64/isa/isa.c#5 integrate .. //depot/projects/smpng/sys/isa/atrtc.c#2 integrate .. //depot/projects/smpng/sys/isa/rtc.h#4 integrate .. //depot/projects/smpng/sys/kern/init_main.c#76 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#123 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#137 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_osd.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_vimage.c#3 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#94 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#56 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#179 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#31 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#89 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#95 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#16 integrate .. //depot/projects/smpng/sys/kern/tty.c#89 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#17 integrate .. //depot/projects/smpng/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#14 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#121 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#114 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#88 integrate .. //depot/projects/smpng/sys/kern/vfs_acl.c#7 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#119 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#55 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#94 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/if_aue.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_auereg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_axe.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_axereg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_cdce.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_cue.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_cuereg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_kue.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_kuereg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_rue.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_ruereg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_rum.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_rumreg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_rumvar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_udav.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_udavreg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_ural.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_uralreg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_uralvar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_zyd.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_zydfw.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_zydreg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/kue_fw.h#2 delete .. //depot/projects/smpng/sys/mips/include/param.h#3 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#5 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#9 integrate .. //depot/projects/smpng/sys/modules/Makefile#160 integrate .. //depot/projects/smpng/sys/modules/ar/Makefile#5 delete .. //depot/projects/smpng/sys/modules/bwi/Makefile#1 branch .. //depot/projects/smpng/sys/modules/linux/Makefile#23 integrate .. //depot/projects/smpng/sys/modules/netgraph/sync_ar/Makefile#4 delete .. //depot/projects/smpng/sys/modules/netgraph/sync_sr/Makefile#4 delete .. //depot/projects/smpng/sys/modules/ray/Makefile#4 delete .. //depot/projects/smpng/sys/modules/sr/Makefile#5 delete .. //depot/projects/smpng/sys/net/bpf.c#83 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#26 integrate .. //depot/projects/smpng/sys/net/ethernet.h#17 integrate .. //depot/projects/smpng/sys/net/flowtable.c#1 branch .. //depot/projects/smpng/sys/net/flowtable.h#1 branch .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#13 integrate .. //depot/projects/smpng/sys/net/if.c#117 integrate .. //depot/projects/smpng/sys/net/if.h#40 integrate .. //depot/projects/smpng/sys/net/if_arc.h#10 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#26 integrate .. //depot/projects/smpng/sys/net/if_atm.h#14 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#28 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#57 integrate .. //depot/projects/smpng/sys/net/if_clone.c#12 integrate .. //depot/projects/smpng/sys/net/if_dead.c#1 branch .. //depot/projects/smpng/sys/net/if_disc.c#26 integrate .. //depot/projects/smpng/sys/net/if_ef.c#29 integrate .. //depot/projects/smpng/sys/net/if_enc.c#11 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#97 integrate .. //depot/projects/smpng/sys/net/if_faith.c#37 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#35 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#22 integrate .. //depot/projects/smpng/sys/net/if_gif.c#50 integrate .. //depot/projects/smpng/sys/net/if_gif.h#18 integrate .. //depot/projects/smpng/sys/net/if_gre.c#39 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#33 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#16 integrate .. //depot/projects/smpng/sys/net/if_lagg.h#6 integrate .. //depot/projects/smpng/sys/net/if_llatbl.c#3 integrate .. //depot/projects/smpng/sys/net/if_llatbl.h#2 integrate .. //depot/projects/smpng/sys/net/if_loop.c#55 integrate .. //depot/projects/smpng/sys/net/if_mib.c#15 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#40 integrate .. //depot/projects/smpng/sys/net/if_stf.c#46 integrate .. //depot/projects/smpng/sys/net/if_tun.c#59 integrate .. //depot/projects/smpng/sys/net/if_var.h#61 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#65 integrate .. //depot/projects/smpng/sys/net/iso88025.h#8 integrate .. //depot/projects/smpng/sys/net/netisr.c#15 integrate .. //depot/projects/smpng/sys/net/radix_mpath.c#4 integrate .. //depot/projects/smpng/sys/net/route.c#46 integrate .. //depot/projects/smpng/sys/net/route.h#31 integrate .. //depot/projects/smpng/sys/net/rtsock.c#70 integrate .. //depot/projects/smpng/sys/net/vnet.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#39 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#20 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#14 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#46 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#46 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#27 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#42 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#33 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_superg.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_superg.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#38 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#8 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#16 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#10 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#37 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#64 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#33 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#40 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#35 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#15 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#69 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#31 integrate .. //depot/projects/smpng/sys/netinet/in.c#51 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#12 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#93 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#62 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#24 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#25 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#33 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#64 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#36 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#48 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#107 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_nat.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#26 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#49 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#98 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#66 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#15 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#106 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#80 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#12 integrate .. //depot/projects/smpng/sys/netinet/sctp_crc32.c#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#22 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#22 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#18 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#112 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#71 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#67 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#91 integrate .. //depot/projects/smpng/sys/netinet/vinet.h#8 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#52 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#53 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#23 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#32 integrate .. //depot/projects/smpng/sys/netinet6/in6_mcast.c#1 branch .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#60 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#29 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#20 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#21 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#61 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#38 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#62 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#28 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#29 integrate .. //depot/projects/smpng/sys/netinet6/mld6.h#1 branch .. //depot/projects/smpng/sys/netinet6/mld6_var.h#7 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#52 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#16 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#35 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#30 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#60 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#56 integrate .. //depot/projects/smpng/sys/netinet6/vinet6.h#7 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#34 integrate .. //depot/projects/smpng/sys/netipsec/key.c#34 integrate .. //depot/projects/smpng/sys/netipsec/key.h#5 integrate .. //depot/projects/smpng/sys/netipsec/vipsec.h#6 integrate .. //depot/projects/smpng/sys/netipsec/xform_tcp.c#6 integrate .. //depot/projects/smpng/sys/netipx/ipx_outputfl.c#9 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#31 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_krpc.c#4 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#87 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#13 integrate .. //depot/projects/smpng/sys/pc98/cbus/olpt.c#5 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#83 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#51 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#12 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/locore.S#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#8 integrate .. //depot/projects/smpng/sys/powerpc/booke/swtch.S#3 integrate .. //depot/projects/smpng/sys/powerpc/booke/vm_machdep.c#4 integrate .. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#6 integrate .. //depot/projects/smpng/sys/powerpc/include/hid.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#16 integrate .. //depot/projects/smpng/sys/powerpc/include/pte.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/trap_aim.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#11 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/atpic.c#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/isa.c#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#6 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#15 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/bus_machdep.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#19 integrate .. //depot/projects/smpng/sys/rpc/svc.h#3 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#18 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#16 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_fcntl.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#15 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#16 integrate .. //depot/projects/smpng/sys/security/audit/audit_private.h#14 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#21 integrate .. //depot/projects/smpng/sys/security/mac/mac_atalk.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_audit.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_cred.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#15 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet6.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#20 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#24 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#16 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_shm.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_priv.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#22 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#14 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#24 integrate .. //depot/projects/smpng/sys/sparc64/include/param.h#20 integrate .. //depot/projects/smpng/sys/sun4v/include/param.h#3 integrate .. //depot/projects/smpng/sys/sys/acl.h#13 integrate .. //depot/projects/smpng/sys/sys/buf_ring.h#3 integrate .. //depot/projects/smpng/sys/sys/jail.h#25 integrate .. //depot/projects/smpng/sys/sys/ktr.h#27 integrate .. //depot/projects/smpng/sys/sys/malloc.h#29 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#82 integrate .. //depot/projects/smpng/sys/sys/osd.h#3 integrate .. //depot/projects/smpng/sys/sys/param.h#143 integrate .. //depot/projects/smpng/sys/sys/priv.h#16 integrate .. //depot/projects/smpng/sys/sys/proc.h#196 integrate .. //depot/projects/smpng/sys/sys/queue.h#20 integrate .. //depot/projects/smpng/sys/sys/smp.h#21 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#63 integrate .. //depot/projects/smpng/sys/sys/syscall.h#88 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#88 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#59 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#57 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#92 integrate .. //depot/projects/smpng/sys/sys/termios.h#10 integrate .. //depot/projects/smpng/sys/sys/ucred.h#30 integrate .. //depot/projects/smpng/sys/sys/vimage.h#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/dinode.h#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#19 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#35 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#74 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#79 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#74 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#96 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#106 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#70 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#70 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#32 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.89 2009/04/13 19:20:32 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $"); #include #include @@ -95,7 +95,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -978,7 +977,6 @@ /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -994,8 +992,7 @@ bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; @@ -1042,9 +1039,6 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1069,7 +1063,7 @@ M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; @@ -1137,9 +1131,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1158,6 +1150,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#33 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.171 2009/01/22 21:04:46 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $"); #include "opt_cpu.h" @@ -106,9 +106,6 @@ { CENTAUR_VENDOR_ID, CPU_VENDOR_CENTAUR }, /* CentaurHauls */ }; -int cpu_cores; -int cpu_logical; - extern int pq_l2size; extern int pq_l2nways; @@ -195,7 +192,6 @@ cpu_vendor_id == CPU_VENDOR_CENTAUR) { printf(" Stepping = %u", cpu_id & 0xf); if (cpu_high > 0) { - u_int cmp = 1, htt = 1; /* * Here we should probably set up flags indicating @@ -400,28 +396,6 @@ if (tsc_is_invariant) printf("\n TSC: P-state invariant"); - /* - * If this CPU supports HTT or CMP then mention the - * number of physical/logical cores it contains. - */ - if (cpu_feature & CPUID_HTT) - htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16; - if (cpu_vendor_id == CPU_VENDOR_AMD && - (amd_feature2 & AMDID2_CMP)) - cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1; - else if (cpu_vendor_id == CPU_VENDOR_INTEL && - (cpu_high >= 4)) { - cpuid_count(4, 0, regs); - if ((regs[0] & 0x1f) != 0) - cmp = ((regs[0] >> 26) & 0x3f) + 1; - } - cpu_cores = cmp; - cpu_logical = htt / cmp; - if (cmp > 1) - printf("\n Cores per package: %d", cmp); - if ((htt / cmp) > 1) - printf("\n Logical CPUs per core: %d", - cpu_logical); } } /* Avoid ugly blank lines: only print newline when we have to. */ @@ -498,6 +472,22 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; + /* + * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID + * function number again if it is set from BIOS. It is necessary + * for probing correct CPU topology later. + * XXX This is only done on the BSP package. + */ + if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) { + uint64_t msr; + msr = rdmsr(MSR_IA32_MISC_ENABLE); + if ((msr & 0x400000ULL) != 0) { + wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL); + do_cpuid(0, regs); + cpu_high = regs[0]; + } + } + if (cpu_vendor_id == CPU_VENDOR_INTEL || cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_CENTAUR) { ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#40 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -112,7 +112,7 @@ u_long la_stat_ticks; u_long la_prof_ticks; /* Include IDT_SYSCALL to make indexing easier. */ - u_int la_ioint_irqs[APIC_NUM_IOINTS + 1]; + int la_ioint_irqs[APIC_NUM_IOINTS + 1]; } static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -254,6 +254,8 @@ lapics[apic_id].la_lvts[i] = lvts[i]; lapics[apic_id].la_lvts[i].lvt_active = 0; } + for (i = 0; i <= APIC_NUM_IOINTS; i++) + lapics[apic_id].la_ioint_irqs[i] = -1; lapics[apic_id].la_ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL; lapics[apic_id].la_ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] = IRQ_TIMER; @@ -317,7 +319,7 @@ } /* We don't setup the timer during boot on the BSP until later. */ - if (!(boot && PCPU_GET(cpuid) == 0)) { + if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", lapic_id())); lapic_timer_set_divisor(lapic_timer_divisor); @@ -363,11 +365,15 @@ lapic_setup_clock(void) { u_long value; + int i; /* Can't drive the timer without a local APIC. */ if (lapic == NULL) return (0); + if (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0) + return (0); + /* Start off with a divisor of 2 (power on reset default). */ lapic_timer_divisor = 2; @@ -807,7 +813,7 @@ */ mtx_lock_spin(&icu_lock); for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { - if (lapics[apic_id].la_ioint_irqs[vector] != 0) + if (lapics[apic_id].la_ioint_irqs[vector] != -1) continue; lapics[apic_id].la_ioint_irqs[vector] = irq; mtx_unlock_spin(&icu_lock); @@ -847,7 +853,7 @@ for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { /* Vector is in use, end run. */ - if (lapics[apic_id].la_ioint_irqs[vector] != 0) { + if (lapics[apic_id].la_ioint_irqs[vector] != -1) { run = 0; first = 0; continue; @@ -932,7 +938,7 @@ sched_bind(td, apic_cpuid(apic_id)); thread_unlock(td); mtx_lock_spin(&icu_lock); - lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; + lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1; mtx_unlock_spin(&icu_lock); thread_lock(td); sched_unbind(td); @@ -944,11 +950,15 @@ u_int apic_idt_to_irq(u_int apic_id, u_int vector) { + int irq; KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); - return (lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]); + irq = lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]; + if (irq < 0) + irq = 0; + return (irq); } #ifdef DDB @@ -974,7 +984,7 @@ db_printf("Interrupts bound to lapic %u\n", apic_id); for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = lapics[apic_id].la_ioint_irqs[i]; - if (irq == 0 || irq == IRQ_SYSCALL) + if (irq == -1 || irq == IRQ_SYSCALL) continue; db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); if (irq == IRQ_TIMER) ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#55 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.302 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -57,6 +57,7 @@ #include #include +#include #include #include #include @@ -160,6 +161,8 @@ static volatile u_int cpu_ipi_pending[MAXCPU]; static u_int boot_address; +static int cpu_logical; +static int cpu_cores; static void assign_cpu_ids(void); static void set_interrupt_apic_ids(void); @@ -181,13 +184,148 @@ mem_range_softc.mr_op->initAP(&mem_range_softc); } -struct cpu_group * -cpu_topo(void) +static void +topo_probe_0xb(void) +{ + int logical; + int p[4]; + int bits; + int type; + int cnt; + int i; + int x; + + /* We only support two levels for now. */ + for (i = 0; i < 3; i++) { + cpuid_count(0x0B, i, p); + bits = p[0] & 0x1f; + logical = p[1] &= 0xffff; + type = (p[2] >> 8) & 0xff; + if (type == 0 || logical == 0) + break; + for (cnt = 0, x = 0; x <= MAX_APIC_ID; x++) { + if (!cpu_info[x].cpu_present || + cpu_info[x].cpu_disabled) + continue; + if (x >> bits == boot_cpu_id >> bits) + cnt++; + } + if (type == CPUID_TYPE_SMT) + cpu_logical = cnt; + else if (type == CPUID_TYPE_CORE) + cpu_cores = cnt; + } + if (cpu_logical == 0) + cpu_logical = 1; + cpu_cores /= cpu_logical; +} + +static void +topo_probe_0x4(void) +{ + u_int threads_per_cache, p[4]; + u_int htt, cmp; + int i; + + htt = cmp = 1; + /* + * If this CPU supports HTT or CMP then mention the + * number of physical/logical cores it contains. + */ + if (cpu_feature & CPUID_HTT) + htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16; + if (cpu_vendor_id == CPU_VENDOR_AMD && (amd_feature2 & AMDID2_CMP)) + cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1; + else if (cpu_vendor_id == CPU_VENDOR_INTEL && (cpu_high >= 4)) { + cpuid_count(4, 0, p); + if ((p[0] & 0x1f) != 0) + cmp = ((p[0] >> 26) & 0x3f) + 1; + } + cpu_cores = cmp; + cpu_logical = htt / cmp; + + /* Setup the initial logical CPUs info. */ + if (cpu_feature & CPUID_HTT) + logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; + + /* + * Work out if hyperthreading is *really* enabled. This >>> TRUNCATED FOR MAIL (1000 lines) <<<