Date: Wed, 13 May 2009 16:03:12 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 162015 for review Message-ID: <200905131603.n4DG3CoS028761@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=162015 Change 162015 by thompsa@thompsa_burger on 2009/05/13 16:03:09 IFC Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#15 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#10 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#18 integrate .. //depot/projects/usb/src/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/usb/src/sys/amd64/include/pcpu.h#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#12 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#20 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#12 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#15 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT#9 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#7 integrate .. //depot/projects/usb/src/sys/arm/conf/CRB#6 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/EP80219#10 integrate .. //depot/projects/usb/src/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#9 integrate .. //depot/projects/usb/src/sys/arm/conf/IQ31244#10 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#19 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#7 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/usb/src/sys/arm/conf/SIMICS#10 integrate .. //depot/projects/usb/src/sys/arm/conf/SKYEYE#9 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#9 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#10 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#11 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_mib.h#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.h#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_util.h#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/usb/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/usb/src/sys/conf/NOTES#34 integrate .. //depot/projects/usb/src/sys/conf/files#61 integrate .. //depot/projects/usb/src/sys/conf/files.i386#23 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#18 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/usb/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/usb/src/sys/dev/asr/asr.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#11 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.h#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#24 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#18 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#12 integrate .. //depot/projects/usb/src/sys/dev/bwi/bwimac.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#12 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/usb/src/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/usb/src/sys/dev/snp/snp.c#11 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/usb/src/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/usb/src/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_revision.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#145 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#56 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#8 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#12 integrate .. //depot/projects/usb/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.c#4 integrate .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/usb/src/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs.c#5 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#7 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#9 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#13 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#11 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_plex.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_raid5.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_subr.c#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#10 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#11 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#21 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#9 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#8 integrate .. //depot/projects/usb/src/sys/i386/conf/XEN#6 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#15 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix.h#4 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#11 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_acct.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_osd.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_vimage.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_kdb.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#5 integrate .. //depot/projects/usb/src/sys/kern/sys_socket.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#20 integrate .. //depot/projects/usb/src/sys/kern/tty_ttydisc.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_export.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_extattr.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#19 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#18 integrate .. //depot/projects/usb/src/sys/mips/conf/ADM5120#5 integrate .. //depot/projects/usb/src/sys/mips/conf/IDT#7 integrate .. //depot/projects/usb/src/sys/mips/conf/MALTA#5 integrate .. //depot/projects/usb/src/sys/mips/conf/QEMU#4 integrate .. //depot/projects/usb/src/sys/mips/conf/SENTRY5#6 integrate .. //depot/projects/usb/src/sys/modules/linux/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/opensolaris/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/sound/sound/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/svr4/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#17 integrate .. //depot/projects/usb/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/usb/src/sys/net/bpf.c#16 integrate .. //depot/projects/usb/src/sys/net/if.c#24 integrate .. //depot/projects/usb/src/sys/net/if_clone.c#4 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/usb/src/sys/net/if_var.h#16 integrate .. //depot/projects/usb/src/sys/net/netisr.c#6 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#21 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#18 integrate .. //depot/projects/usb/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#19 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in.c#22 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#16 integrate .. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/route6.c#9 integrate .. //depot/projects/usb/src/sys/netipsec/xform_tcp.c#3 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs.h#9 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#22 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#15 integrate .. //depot/projects/usb/src/sys/nlm/nlm_advlock.c#4 integrate .. //depot/projects/usb/src/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/usb/src/sys/pc98/cbus/clock.c#9 integrate .. //depot/projects/usb/src/sys/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#16 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#18 integrate .. //depot/projects/usb/src/sys/powerpc/conf/MPC85XX#6 integrate .. //depot/projects/usb/src/sys/powerpc/conf/NOTES#12 integrate .. //depot/projects/usb/src/sys/security/audit/audit_worker.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/sys/_null.h#3 integrate .. //depot/projects/usb/src/sys/sys/buf_ring.h#3 integrate .. //depot/projects/usb/src/sys/sys/ioctl.h#3 integrate .. //depot/projects/usb/src/sys/sys/ioctl_compat.h#5 integrate .. //depot/projects/usb/src/sys/sys/jail.h#13 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#13 integrate .. //depot/projects/usb/src/sys/sys/mount.h#17 integrate .. //depot/projects/usb/src/sys/sys/param.h#29 integrate .. //depot/projects/usb/src/sys/sys/proc.h#18 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#17 integrate .. //depot/projects/usb/src/sys/sys/termios.h#7 integrate .. //depot/projects/usb/src/sys/sys/ucred.h#5 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#9 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#18 integrate .. //depot/projects/usb/src/sys/ufs/ufs/extattr.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_extattr.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#13 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#15 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#15 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $"); #include "opt_cpu.h" @@ -472,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/usb/src/sys/amd64/amd64/local_apic.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.54 2009/05/01 20:53:37 mav 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" @@ -319,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); ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#10 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $ machine amd64 @@ -21,4 +21,4 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR -options FLOWTABLE +options FLOWTABLE ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#25 (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.524 2009/05/01 17:20:16 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -68,7 +68,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks @@ -114,7 +114,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family -#device ispfw # Firmware for QLogic HBAs- normally a module +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -260,7 +260,7 @@ device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/usb/src/sys/amd64/conf/NOTES#18 (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.89 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $ # # @@ -33,7 +33,7 @@ # # Debugging options. # -options STOP_NMI # Stop CPUS using NMI instead of IPI +options STOP_NMI # Stop CPUS using NMI instead of IPI @@ -82,7 +82,7 @@ # BPF_JITTER adds support for BPF just-in-time compiler. -options BPF_JITTER +options BPF_JITTER ##################################################################### @@ -153,7 +153,7 @@ # # AGP debugging. # -options AGP_DEBUG +options AGP_DEBUG ##################################################################### @@ -288,7 +288,7 @@ device ath # Atheros pci/cardbus NIC's device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath #device ath_rate_amrr # AMRR rate control for ath driver #device ath_rate_onoe # Onoe rate control for ath driver @@ -457,7 +457,7 @@ #Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS # # SysVR4 ABI emulation ==== //depot/projects/usb/src/sys/amd64/conf/XENHVM#2 (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/XENHVM,v 1.1 2009/03/11 15:30:12 dfr Exp $ +# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.3 2009/05/10 00:00:25 kuriyama Exp $ cpu HAMMER ident GENERIC @@ -69,10 +69,12 @@ options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options STOP_NMI # Stop CPUS using NMI instead of IPI -options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS # Debugging for use in -current options KDB # Enable kernel debugger support. @@ -97,7 +99,7 @@ device fdc # Xen HVM support -options XENHVM +options XENHVM device xenpci # ATA and ATAPI devices ==== //depot/projects/usb/src/sys/amd64/include/pcpu.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.53 2009/04/01 13:09:26 kib Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.54 2009/05/06 17:48:39 dfr Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -75,7 +75,7 @@ /* Pointer to the CPU LDT descriptor */ \ struct system_segment_descriptor *pc_ldt; \ /* Pointer to the CPU TSS descriptor */ \ - struct system_segment_descriptor *pc_tss + struct system_segment_descriptor *pc_tss \ PCPU_XEN_FIELDS #ifdef _KERNEL ==== //depot/projects/usb/src/sys/amd64/linux32/linux.h#12 (text+ko) ==== @@ -27,7 +27,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/linux32/linux.h,v 1.25 2009/03/27 17:00:49 ambrisko Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.27 2009/05/11 13:50:42 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -96,7 +96,7 @@ typedef struct { l_time_t tv_sec; l_suseconds_t tv_usec; -} __packed l_timeval; +} l_timeval; #define l_fd_set fd_set @@ -669,14 +669,6 @@ #define LINUX_SENDMSG 16 #define LINUX_RECVMSG 17 -#define LINUX_AF_UNSPEC 0 -#define LINUX_AF_UNIX 1 -#define LINUX_AF_INET 2 -#define LINUX_AF_AX25 3 -#define LINUX_AF_IPX 4 -#define LINUX_AF_APPLETALK 5 -#define LINUX_AF_INET6 10 - #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 #define LINUX_SOL_IPX 256 ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.48 2009/05/02 10:06:49 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.51 2009/05/10 18:43:43 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -261,7 +261,17 @@ pos = base + (imgp->args->argc + imgp->args->envc + 2); AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); + + /* + * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0, + * as it has appeared in the 2.4.0-rc7 first time. + * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK), + * glibc falls back to the hard-coded CLK_TCK value when aux entry + * is not present. + * Also see linux_times() implementation. + */ + if (linux_kernver(curthread) >= LINUX_KERNVER_2004000) + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -1124,6 +1134,8 @@ linux_proc_exec, NULL, 1000); linux_szplatform = roundup(strlen(linux_platform) + 1, sizeof(char *)); + linux_osd_jail_register(); + stclohz = (stathz ? stathz : hz); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -1151,6 +1163,7 @@ EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); + linux_osd_jail_deregister(); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/usb/src/sys/arm/arm/cpufunc.c#9 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.25 2009/01/09 10:45:04 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.26 2009/05/05 12:57:16 stas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1192,6 +1192,7 @@ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || + (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA27X || (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) { cpufuncs = xscale_cpufuncs; ==== //depot/projects/usb/src/sys/arm/arm/pmap.c#14 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.107 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.108 2009/05/07 05:42:13 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -224,7 +224,6 @@ vm_offset_t kernel_vm_end = 0; struct pmap kernel_pmap_store; -pmap_t kernel_pmap; static pt_entry_t *csrc_pte, *cdst_pte; static vm_offset_t csrcp, cdstp; @@ -2337,7 +2336,6 @@ firstaddr, loadaddr)); virtual_avail = firstaddr; - kernel_pmap = &kernel_pmap_store; kernel_pmap->pm_l1 = l1; kernel_l1pa = l1pt->pv_pa; ==== //depot/projects/usb/src/sys/arm/at91/at91_cfata.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.2 2009/04/23 00:00:57 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.3 2009/05/10 11:05:22 stas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -131,9 +131,9 @@ struct resource *r) { - KASSERT(type == SYS_RES_IRQ && *rid == ATA_IRQ_RID, + KASSERT(type == SYS_RES_IRQ && rid == ATA_IRQ_RID, ("[at91_cfata, %d]: illegal resource request (type %u rid %u)", - __LINE__, type, *rid)); + __LINE__, type, rid)); return (0); } ==== //depot/projects/usb/src/sys/arm/at91/if_ate.c#12 (text) ==== @@ -23,18 +23,14 @@ * SUCH DAMAGE. */ -/* TODO: (in no order) +/* TODO * - * 8) Need to sync busdma goo in atestop - * 9) atestop should maybe free the mbufs? - * - * 1) detach - * 2) Free dma setup - * 3) Turn on the clock in pmc? Turn off? + * 1) Turn on the clock in pmc? Turn off? + * 2) GPIO initializtion in board setup code. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.30 2008/11/25 00:14:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.35 2009/05/12 21:28:41 stas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,6 +72,12 @@ #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 +/* + * Driver-specific flags. + */ +#define ATE_FLAG_DETACHING 0x01 +#define ATE_FLAG_MULTICAST 0x02 + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -100,6 +102,8 @@ eth_rx_desc_t *rx_descs; int use_rmii; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ + int flags; + int if_flags; }; static inline uint32_t @@ -114,6 +118,13 @@ bus_write_4(sc->mem_res, off, val); } +static inline void +BARRIER(struct ate_softc *sc, bus_size_t off, bus_size_t len, int flags) +{ + + bus_barrier(sc->mem_res, off, len, flags); +} + #define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define ATE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define ATE_LOCK_INIT(_sc) \ @@ -144,11 +155,12 @@ /* helper routines */ static int ate_activate(device_t dev); -static void ate_deactivate(device_t dev); +static void ate_deactivate(struct ate_softc *sc); static int ate_ifmedia_upd(struct ifnet *ifp); static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_rxfilter(struct ate_softc *sc); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -170,11 +182,33 @@ struct ifnet *ifp = NULL; struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; - int err; u_char eaddr[ETHER_ADDR_LEN]; uint32_t rnd; + int rid, err; sc->dev = dev; + ATE_LOCK_INIT(sc); + + /* + * Allocate resources. + */ + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, "could not allocate memory resources.\n"); + err = ENOMEM; + goto out; + } + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res == NULL) { + device_printf(dev, "could not allocate interrupt resources.\n"); + err = ENOMEM; + goto out; + } + err = ate_activate(dev); if (err) goto out; @@ -188,8 +222,9 @@ CTLFLAG_RD, &sc->use_rmii, 0, "rmii in use"); /* calling atestop before ifp is set is OK */ + ATE_LOCK(sc); atestop(sc); - ATE_LOCK_INIT(sc); + ATE_UNLOCK(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { @@ -238,30 +273,70 @@ ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->if_flags = ifp->if_flags; ether_ifattach(ifp, eaddr); /* - * Activate the interrupt + * Activate the interrupt. */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, NULL, ate_intr, sc, &sc->intrhand); if (err) { + device_printf(dev, "could not establish interrupt handler.\n"); ether_ifdetach(ifp); - ATE_LOCK_DESTROY(sc); + goto out; } -out:; + +out: if (err) - ate_deactivate(dev); - if (err && ifp) - if_free(ifp); + ate_detach(dev); return (err); } static int ate_detach(device_t dev) { - return EBUSY; /* XXX TODO(1) */ + struct ate_softc *sc; + struct ifnet *ifp; + + sc = device_get_softc(dev); + KASSERT(sc != NULL, ("[ate: %d]: sc is NULL", __LINE__)); + ifp = sc->ifp; + if (device_is_attached(dev)) { + ATE_LOCK(sc); + sc->flags |= ATE_FLAG_DETACHING; + atestop(sc); + ATE_UNLOCK(sc); + callout_drain(&sc->tick_ch); + ether_ifdetach(ifp); + } + if (sc->miibus != NULL) { + device_delete_child(dev, sc->miibus); + sc->miibus = NULL; + } + bus_generic_detach(sc->dev); + ate_deactivate(sc); + if (sc->intrhand != NULL) { + bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + sc->intrhand = NULL; + } + if (ifp != NULL) { + if_free(ifp); + sc->ifp = NULL; + } + if (sc->mem_res != NULL) { + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(sc->mem_res), sc->mem_res); + sc->mem_res = NULL; + } + if (sc->irq_res != NULL) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); + sc->irq_res = NULL; + } + ATE_LOCK_DESTROY(sc); + return (0); } static void @@ -307,26 +382,39 @@ * of different MAC chips use this method (or the reverse the bits) * method. */ -static void +static int ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; u_char *af = (u_char *) mcaf; struct ifmultiaddr *ifma; + struct ifnet *ifp; + ifp = sc->ifp; + + if ((ifp->if_flags & IFF_PROMISC) != 0) + return (0); + if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + WR4(sc, ETH_HSL, 0xffffffff); + WR4(sc, ETH_HSH, 0xffffffff); + return (1); + } + + /* + * Compute the multicast hash. + */ mcaf[0] = 0; mcaf[1] = 0; - - IF_ADDR_LOCK(sc->ifp); - TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } - IF_ADDR_UNLOCK(sc->ifp); + IF_ADDR_UNLOCK(ifp); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905131603.n4DG3CoS028761>