PERFORCE change 164481 for review
Scott Long
scottl at FreeBSD.org
Tue Jun 16 05:32:51 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=164481
Change 164481 by scottl at scottl-deimos on 2009/06/16 05:32:21
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#23 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC.hints#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#19 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#20 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#29 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#32 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_desc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cas/if_cas.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/cas/if_casreg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/cas/if_casvar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/nsgphy.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_bus_subr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_bus_subr.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_disk.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_if.m#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_iicbus.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_standard.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofwvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirmio.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sec/sec.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_rate.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/version.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/daemon/daemon_saver.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/tsec/if_tsec.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/tsec/if_tsec.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mbus.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/udbp.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/ufm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_auereg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axereg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_rue.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_ruereg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_udav.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_udavreg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uark.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ucycom.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ufoma.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ugensa.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ulpt.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umct.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/urio.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/ustorage_fs.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template_msc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_bus.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_controller.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_defs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_endian.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_error.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_error.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_ioctl.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_lookup.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_lookup.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mbuf.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mbuf.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mfunc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_parse.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_parse.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_pci.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_revision.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_util.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_util.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbhid.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/blkfront/blkfront.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/netfront/netfront.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_gpt.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#22 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/in_cksum.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_vimage.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kgssapi/krb5/krb5_mech.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/ADM5120#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/files.idt#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/gt_pci.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mainbus.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#28 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/cas/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/if_ppp/Makefile#8 delete
.. //depot/projects/scottl-camlock/src/sys/modules/if_sl/Makefile#3 delete
.. //depot/projects/scottl-camlock/src/sys/net/if.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net/netisr.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net/netisr.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm_advlock.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#20 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/jail.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priv.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vimage.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/tools/sound/feeder_rate_mkfilter.awk#2 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/phys_pager.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.h#9 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#8 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.10 2009/01/29 09:22:56 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.11 2009/06/15 13:47:49 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -210,6 +210,8 @@
old_id = msi->msi_cpu;
if (old_vector && old_id == apic_id)
return;
+ if (old_vector && !msi->msi_msix && msi->msi_first->msi_count > 1)
+ return;
/* Allocate IDT vector on this cpu. */
vector = apic_alloc_vector(apic_id, msi->msi_irq);
if (vector == 0)
==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#26 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.660 2009/06/08 18:23:43 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.661 2009/06/14 19:51:43 alc Exp $");
/*
* Manages physical address maps.
@@ -3322,78 +3322,74 @@
pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object,
vm_pindex_t pindex, vm_size_t size)
{
- vm_offset_t va;
+ pd_entry_t *pde;
+ vm_paddr_t pa, ptepa;
vm_page_t p, pdpg;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
KASSERT(object->type == OBJT_DEVICE,
("pmap_object_init_pt: non-device object"));
- if (((addr & (NBPDR - 1)) == 0) && ((size & (NBPDR - 1)) == 0)) {
- vm_page_t m[1];
- pd_entry_t ptepa, *pde;
-
- PMAP_LOCK(pmap);
- pde = pmap_pde(pmap, addr);
- if (pde != 0 && (*pde & PG_V) != 0)
- goto out;
- PMAP_UNLOCK(pmap);
-retry:
+ if ((addr & (NBPDR - 1)) == 0 && (size & (NBPDR - 1)) == 0) {
+ if (!vm_object_populate(object, pindex, pindex + atop(size)))
+ return;
p = vm_page_lookup(object, pindex);
- if (p != NULL) {
- if (vm_page_sleep_if_busy(p, FALSE, "init4p"))
- goto retry;
- } else {
- p = vm_page_alloc(object, pindex, VM_ALLOC_NORMAL);
- if (p == NULL)
- return;
- m[0] = p;
+ KASSERT(p->valid == VM_PAGE_BITS_ALL,
+ ("pmap_object_init_pt: invalid page %p", p));
- if (vm_pager_get_pages(object, m, 1, 0) != VM_PAGER_OK) {
- vm_page_lock_queues();
- vm_page_free(p);
- vm_page_unlock_queues();
- return;
- }
-
- p = vm_page_lookup(object, pindex);
- vm_page_wakeup(p);
- }
-
+ /*
+ * Abort the mapping if the first page is not physically
+ * aligned to a 2MB page boundary.
+ */
ptepa = VM_PAGE_TO_PHYS(p);
if (ptepa & (NBPDR - 1))
return;
- p->valid = VM_PAGE_BITS_ALL;
+ /*
+ * Skip the first page. Abort the mapping if the rest of
+ * the pages are not physically contiguous.
+ */
+ p = TAILQ_NEXT(p, listq);
+ for (pa = ptepa + PAGE_SIZE; pa < ptepa + size;
+ pa += PAGE_SIZE) {
+ KASSERT(p->valid == VM_PAGE_BITS_ALL,
+ ("pmap_object_init_pt: invalid page %p", p));
+ if (pa != VM_PAGE_TO_PHYS(p))
+ return;
+ p = TAILQ_NEXT(p, listq);
+ }
+ /* Map using 2MB pages. */
PMAP_LOCK(pmap);
- for (va = addr; va < addr + size; va += NBPDR) {
- while ((pdpg =
- pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) {
- PMAP_UNLOCK(pmap);
- vm_page_busy(p);
- VM_OBJECT_UNLOCK(object);
- VM_WAIT;
- VM_OBJECT_LOCK(object);
- vm_page_wakeup(p);
- PMAP_LOCK(pmap);
+ for (pa = ptepa; pa < ptepa + size; pa += NBPDR) {
+ pdpg = pmap_allocpde(pmap, addr, M_NOWAIT);
+ if (pdpg == NULL) {
+ /*
+ * The creation of mappings below is only an
+ * optimization. If a page directory page
+ * cannot be allocated without blocking,
+ * continue on to the next mapping rather than
+ * blocking.
+ */
+ addr += NBPDR;
+ continue;
}
pde = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pdpg));
- pde = &pde[pmap_pde_index(va)];
+ pde = &pde[pmap_pde_index(addr)];
if ((*pde & PG_V) == 0) {
- pde_store(pde, ptepa | PG_PS | PG_M | PG_A |
+ pde_store(pde, pa | PG_PS | PG_M | PG_A |
PG_U | PG_RW | PG_V);
- pmap->pm_stats.resident_count +=
- NBPDR / PAGE_SIZE;
+ pmap->pm_stats.resident_count += NBPDR /
+ PAGE_SIZE;
+ pmap_pde_mappings++;
} else {
+ /* Continue on if the PDE is already valid. */
pdpg->wire_count--;
KASSERT(pdpg->wire_count > 0,
("pmap_object_init_pt: missing reference "
- "to page directory page, va: 0x%lx", va));
+ "to page directory page, va: 0x%lx", addr));
}
- ptepa += NBPDR;
+ addr += NBPDR;
}
- pmap_invalidate_all(pmap);
-out:
PMAP_UNLOCK(pmap);
}
}
==== //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#23 (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.528 2009/06/10 02:07:58 yongari Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.529 2009/06/14 18:01:35 ed Exp $
cpu HAMMER
ident GENERIC
@@ -66,6 +66,7 @@
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
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)
==== //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC.hints#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.20 2009/05/14 21:53:35 jhb Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.21 2009/06/15 21:55:29 ps Exp $
hint.fdc.0.at="isa"
hint.fdc.0.port="0x3F0"
hint.fdc.0.irq="6"
@@ -24,3 +24,6 @@
hint.uart.1.irq="3"
hint.ppc.0.at="isa"
hint.ppc.0.irq="7"
+hint.atrtc.0.at="isa"
+hint.atrtc.0.port="0x70"
+hint.atrtc.0.irq="8"
==== //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#19 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.141 2009/06/10 02:07:58 yongari Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.142 2009/06/15 18:22:41 marius Exp $
##############################################################
### Basic configuration options ############################
@@ -221,6 +221,7 @@
if_bce_load="NO" # Broadcom NetXtreme II Gigabit Ethernet
if_bfe_load="NO" # Broadcom BCM4401
if_bge_load="NO" # Broadcom BCM570x PCI Gigabit Ethernet
+if_cas_load="NO" # Sun Cassini/Cassini+ and NS DP83065 Saturn
if_cm_load="NO" # SMC (90c26, 90c56, 90c66)
if_cs_load="NO" # Crystal Semiconductor CS8920
if_cue_load="NO" # CATC USB-EL1210A USB Ethernet
==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#8 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11 2007/05/23 13:27:37 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.12 2009/06/14 12:46:34 ed Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@@ -37,6 +37,7 @@
#else /* _KERNEL */
#include <stdlib.h>
#include <stdio.h>
+#include <camlib.h>
#endif /* _KERNEL */
#include <cam/cam.h>
==== //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.4 2009/06/13 15:39:12 jamie Exp $
*
*/
@@ -83,7 +83,7 @@
switch (type) {
case MOD_LOAD:
- utsname.nodename = prison0.pr_host;
+ utsname.nodename = prison0.pr_hostname;
break;
case MOD_UNLOAD:
==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 (text+ko) ====
@@ -179,9 +179,9 @@
spa_history_zone()
{
#ifdef _KERNEL
- /* XXX: pr_host can be changed by default from within a jail! */
+ /* XXX: pr_hostname can be changed by default from within a jail! */
if (jailed(curthread->td_ucred))
- return (curthread->td_ucred->cr_prison->pr_host);
+ return (curthread->td_ucred->cr_prison->pr_hostname);
#endif
return ("global");
}
==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#19 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.101 2009/06/10 13:48:43 kib Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.102 2009/06/15 20:40:23 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194262 2009-06-15 20:38:55Z jhb
*/
#ifndef _FREEBSD32_SYSPROTO_H_
==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#19 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.100 2009/06/10 13:48:43 kib Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.101 2009/06/15 20:40:23 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194262 2009-06-15 20:38:55Z jhb
*/
#define FREEBSD32_SYS_syscall 0
@@ -377,4 +377,5 @@
#define FREEBSD32_SYS_freebsd32_jail_get 506
#define FREEBSD32_SYS_freebsd32_jail_set 507
#define FREEBSD32_SYS_jail_remove 508
-#define FREEBSD32_SYS_MAXSYSCALL 509
+#define FREEBSD32_SYS_closefrom 509
+#define FREEBSD32_SYS_MAXSYSCALL 510
==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.91 2009/06/10 13:48:43 kib Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.92 2009/06/15 20:40:23 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194262 2009-06-15 20:38:55Z jhb
*/
const char *freebsd32_syscallnames[] = {
@@ -516,4 +516,5 @@
"freebsd32_jail_get", /* 506 = freebsd32_jail_get */
"freebsd32_jail_set", /* 507 = freebsd32_jail_set */
"jail_remove", /* 508 = jail_remove */
+ "closefrom", /* 509 = closefrom */
};
==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#19 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.102 2009/06/10 13:48:43 kib Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.103 2009/06/15 20:40:23 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 194262 2009-06-15 20:38:55Z jhb
*/
#include "opt_compat.h"
@@ -547,4 +547,5 @@
{ AS(freebsd32_jail_get_args), (sy_call_t *)freebsd32_jail_get, AUE_NULL, NULL, 0, 0, 0 }, /* 506 = freebsd32_jail_get */
{ AS(freebsd32_jail_set_args), (sy_call_t *)freebsd32_jail_set, AUE_NULL, NULL, 0, 0, 0 }, /* 507 = freebsd32_jail_set */
{ AS(jail_remove_args), (sy_call_t *)jail_remove, AUE_NULL, NULL, 0, 0, 0 }, /* 508 = jail_remove */
+ { AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0, 0 }, /* 509 = closefrom */
};
==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#20 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.116 2009/06/10 13:48:13 kib Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.117 2009/06/15 20:38:55 jhb Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -889,3 +889,4 @@
507 AUE_NULL STD { int freebsd32_jail_set(struct iovec32 *iovp, \
unsigned int iovcnt, int flags); }
508 AUE_NULL NOPROTO { int jail_remove(int jid); }
+509 AUE_CLOSEFROM NOPROTO { int closefrom(int lowfd); }
==== //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#23 (text+ko) ====
@@ -42,7 +42,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.138 2009/06/08 19:57:35 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.139 2009/06/15 19:01:53 jamie Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -1079,7 +1079,7 @@
static int
linprocfs_donetdev(PFS_FILL_ARGS)
{
- INIT_VNET_NET(TD_TO_VNET(curthread));
+ INIT_VNET_NET(TD_TO_VNET(td));
char ifname[16]; /* XXX LINUX_IFNAMSIZ */
struct ifnet *ifp;
==== //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#10 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.22 2009/05/07 16:14:31 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.23 2009/06/14 17:53:55 dchagin Exp $");
#if 0
__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
#endif
@@ -707,8 +707,10 @@
/* XXX: ptrace? */
if (priv_check(td, PRIV_CRED_SETUID) ||
priv_check(td, PRIV_CRED_SETEUID) ||
- p_candebug(td, p))
+ p_candebug(td, p)) {
+ PROC_UNLOCK(p);
return (EPERM);
+ }
head = em->robust_futexes;
PROC_UNLOCK(p);
==== //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#15 (text+ko) ====
@@ -29,7 +29,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.150 2009/06/08 19:57:35 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.151 2009/06/15 19:01:53 jamie Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2091,9 +2091,9 @@
*/
static struct ifnet *
-ifname_linux_to_bsd(const char *lxname, char *bsdname)
+ifname_linux_to_bsd(struct thread *td, const char *lxname, char *bsdname)
{
- INIT_VNET_NET(TD_TO_VNET(curthread));
+ INIT_VNET_NET(TD_TO_VNET(td));
struct ifnet *ifp;
int len, unit;
char *ep;
@@ -2379,7 +2379,7 @@
printf("%s(): ioctl %d on %.*s\n", __func__,
args->cmd & 0xffff, LINUX_IFNAMSIZ, lifname);
#endif
- ifp = ifname_linux_to_bsd(lifname, ifname);
+ ifp = ifname_linux_to_bsd(td, lifname, ifname);
if (ifp == NULL)
return (EINVAL);
/*
==== //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#20 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.238 2009/06/05 14:55:22 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.239 2009/06/13 00:12:02 jamie Exp $");
#include "opt_compat.h"
@@ -716,7 +716,6 @@
struct l_new_utsname utsname;
char osname[LINUX_MAX_UTSNAME];
char osrelease[LINUX_MAX_UTSNAME];
- struct prison *pr;
char *p;
#ifdef DEBUG
@@ -730,6 +729,7 @@
bzero(&utsname, sizeof(utsname));
strlcpy(utsname.sysname, osname, LINUX_MAX_UTSNAME);
getcredhostname(td->td_ucred, utsname.nodename, LINUX_MAX_UTSNAME);
+ getcreddomainname(td->td_ucred, utsname.domainname, LINUX_MAX_UTSNAME);
strlcpy(utsname.release, osrelease, LINUX_MAX_UTSNAME);
strlcpy(utsname.version, version, LINUX_MAX_UTSNAME);
for (p = utsname.version; *p != '\0'; ++p)
@@ -739,11 +739,6 @@
}
strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME);
- pr = td->td_ucred->cr_prison;
- mtx_lock(&pr->pr_mtx);
- strlcpy(utsname.domainname, pr->pr_domain, LINUX_MAX_UTSNAME);
- mtx_unlock(&pr->pr_mtx);
-
return (copyout(&utsname, args->buf, sizeof(utsname)));
}
==== //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.15 2009/06/07 19:41:11 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.16 2009/06/15 01:02:43 thompsa Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -472,7 +472,7 @@
* The NDIS driver is not allowed to change the
* config! There is only one choice!
*/
- cdp = usb2_get_config_descriptor(sc->ndisusb_dev);
+ cdp = usbd_get_config_descriptor(sc->ndisusb_dev);
if (cdp == NULL) {
status = USB_ERR_INVAL;
goto exit;
@@ -492,7 +492,7 @@
status = USB_ERR_NORMAL_COMPLETION;
} else {
NDISUSB_LOCK(sc);
- status = usb2_req_get_desc(sc->ndisusb_dev, &sc->ndisusb_mtx,
+ status = usbd_req_get_desc(sc->ndisusb_dev, &sc->ndisusb_mtx,
&actlen, ctldesc->ucd_trans_buf, 2,
ctldesc->ucd_trans_buflen, ctldesc->ucd_langid,
ctldesc->ucd_desctype, ctldesc->ucd_idx,
@@ -540,16 +540,16 @@
intf = &selconf->usc_intf;
for (i = 0; i < conf->bNumInterface && intf->uii_len > 0; i++) {
- ret = usb2_set_alt_interface_index(udev,
+ ret = usbd_set_alt_interface_index(udev,
intf->uii_intfnum, intf->uii_altset);
if (ret != USB_ERR_NORMAL_COMPLETION && ret != USB_ERR_IN_USE) {
device_printf(dev,
"setting alternate interface failed: %s\n",
- usb2_errstr(ret));
+ usbd_errstr(ret));
return usbd_usb2urb(ret);
}
- for (j = 0; (ep = usb2_endpoint_foreach(udev, ep)); j++) {
+ for (j = 0; (ep = usb_endpoint_foreach(udev, ep)); j++) {
if (j >= intf->uii_numeps) {
device_printf(dev,
"endpoint %d and above are ignored",
@@ -608,11 +608,11 @@
InitializeListHead(&ne->ne_pending);
KeInitializeSpinLock(&ne->ne_lock);
- status = usb2_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer,
+ status = usbd_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer,
epconf, 1, sc, &sc->ndisusb_mtx);
if (status != USB_ERR_NORMAL_COMPLETION) {
device_printf(dev, "couldn't setup xfer: %s\n",
- usb2_errstr(status));
+ usbd_errstr(status));
return (status);
}
xfer = ne->ne_xfer[0];
@@ -680,11 +680,11 @@
if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN)
cfg.flags.short_xfer_ok = 1;
- status = usb2_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer,
+ status = usbd_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer,
&cfg, 1, sc, &sc->ndisusb_mtx);
if (status != USB_ERR_NORMAL_COMPLETION) {
device_printf(dev, "couldn't setup xfer: %s\n",
- usb2_errstr(status));
+ usbd_errstr(status));
return (status);
}
xfer = ne->ne_xfer[0];
@@ -718,8 +718,8 @@
}
NDISUSB_LOCK(sc);
- usb2_transfer_stop(ne->ne_xfer[0]);
- usb2_transfer_start(ne->ne_xfer[0]);
+ usbd_transfer_stop(ne->ne_xfer[0]);
+ usbd_transfer_start(ne->ne_xfer[0]);
NDISUSB_UNLOCK(sc);
return (USBD_STATUS_SUCCESS);
@@ -800,8 +800,8 @@
* cancelled and then restarted.
*/
NDISUSB_LOCK(sc);
- usb2_transfer_stop(ne->ne_xfer[0]);
- usb2_transfer_start(ne->ne_xfer[0]);
+ usbd_transfer_stop(ne->ne_xfer[0]);
+ usbd_transfer_start(ne->ne_xfer[0]);
NDISUSB_UNLOCK(sc);
ip->irp_cancel = TRUE;
@@ -873,7 +873,7 @@
/* copy in data with regard to the URB */
if (ne->ne_dirin != 0)
- usb2_copy_out(xfer->frbuffers, 0, nx->nx_urbbuf,
+ usbd_copy_out(xfer->frbuffers, 0, nx->nx_urbbuf,
xfer->frlengths[0]);
nx->nx_urbbuf += xfer->frlengths[0];
nx->nx_urbactlen += xfer->frlengths[0];
@@ -929,10 +929,10 @@
extra:
len = MIN(xfer->max_data_length, nx->nx_urblen);
if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_OUT)
- usb2_copy_in(xfer->frbuffers, 0, nx->nx_urbbuf, len);
+ usbd_copy_in(xfer->frbuffers, 0, nx->nx_urbbuf, len);
xfer->frlengths[0] = len;
xfer->nframes = 1;
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
break;
default:
nx = usbd_aq_getfirst(sc, ne);
@@ -941,7 +941,7 @@
if (xfer->error != USB_ERR_CANCELLED) {
xfer->flags.stall_pipe = 1;
device_printf(sc->ndis_dev, "usb xfer warning (%s)\n",
- usb2_errstr(xfer->error));
+ usbd_errstr(xfer->error));
}
usbd_xfer_complete(sc, ne, nx, xfer->error);
if (xfer->error != USB_ERR_CANCELLED)
@@ -974,7 +974,7 @@
vcreq = &urb->uu_vcreq;
if (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) {
- usb2_copy_out(xfer->frbuffers + 1, 0,
+ usbd_copy_out(xfer->frbuffers + 1, 0,
vcreq->uvc_trans_buf, xfer->frlengths[1]);
nx->nx_urbactlen += xfer->frlengths[1];
}
@@ -1044,7 +1044,7 @@
nx->nx_urblen = vcreq->uvc_trans_buflen;
nx->nx_urbactlen = 0;
- usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
+ usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req));
xfer->frlengths[0] = sizeof(req);
xfer->nframes = 1;
if (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) {
@@ -1066,13 +1066,13 @@
* the future if it needs to be.
*/
if (nx->nx_urblen > 0) {
- usb2_copy_in(xfer->frbuffers + 1 , 0,
+ usbd_copy_in(xfer->frbuffers + 1 , 0,
nx->nx_urbbuf, nx->nx_urblen);
xfer->frlengths[1] = nx->nx_urblen;
xfer->nframes = 2;
}
}
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
break;
default:
nx = usbd_aq_getfirst(sc, ne);
@@ -1081,7 +1081,7 @@
if (xfer->error != USB_ERR_CANCELLED) {
xfer->flags.stall_pipe = 1;
device_printf(sc->ndis_dev, "usb xfer warning (%s)\n",
- usb2_errstr(xfer->error));
+ usbd_errstr(xfer->error));
}
usbd_xfer_complete(sc, ne, nx, xfer->error);
if (xfer->error != USB_ERR_CANCELLED)
@@ -1244,7 +1244,7 @@
ne = usbd_get_ndisep(ip, urb->uu_bulkintr.ubi_epdesc);
if (ne == NULL)
goto exit;
- usb2_transfer_start(ne->ne_xfer[0]);
+ usbd_transfer_start(ne->ne_xfer[0]);
break;
case NDISUSB_TASK_IRPCANCEL:
ne = usbd_get_ndisep(ip,
@@ -1254,14 +1254,14 @@
if (ne == NULL)
goto exit;
- usb2_transfer_stop(ne->ne_xfer[0]);
- usb2_transfer_start(ne->ne_xfer[0]);
+ usbd_transfer_stop(ne->ne_xfer[0]);
+ usbd_transfer_start(ne->ne_xfer[0]);
break;
case NDISUSB_TASK_VENDOR:
ne = (urb->uu_vcreq.uvc_trans_flags &
USBD_TRANSFER_DIRECTION_IN) ?
&sc->ndisusb_dread_ep : &sc->ndisusb_dwrite_ep;
- usb2_transfer_start(ne->ne_xfer[0]);
+ usbd_transfer_start(ne->ne_xfer[0]);
break;
default:
break;
@@ -1437,7 +1437,7 @@
struct usb_descriptor *next = NULL;
usb_interface_descriptor_t *desc;
- while ((next = usb2_desc_foreach(conf, next)) != NULL) {
+ while ((next = usb_desc_foreach(conf, next)) != NULL) {
desc = (usb_interface_descriptor_t *)next;
if (desc->bDescriptorType != UDESC_INTERFACE)
continue;
==== //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#8 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.31 2009/05/30 07:33:32 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.32 2009/06/13 00:12:02 jamie Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -411,10 +411,10 @@
struct thread *td;
struct svr4_sys_systeminfo_args *uap;
{
- struct prison *pr;
char *str = NULL;
int error = 0;
register_t *retval = td->td_retval;
+ u_long hostid;
size_t len = 0;
char buf[MAXHOSTNAMELEN];
u_int rlen = uap->len;
@@ -458,10 +458,8 @@
break;
case SVR4_SI_HW_SERIAL:
- pr = td->td_ucred->cr_prison;
- mtx_lock(&pr->pr_mtx);
- snprintf(buf, sizeof(buf), "%lu", pr->pr_hostid);
- mtx_unlock(&pr->pr_mtx);
+ getcredhostid(td->td_ucred, &hostid);
+ snprintf(buf, sizeof(buf), "%lu", hostid);
str = buf;
break;
@@ -470,10 +468,7 @@
break;
case SVR4_SI_SRPC_DOMAIN:
- pr = td->td_ucred->cr_prison;
- mtx_lock(&pr->pr_mtx);
- strlcpy(buf, pr->pr_domain, sizeof(buf));
- mtx_unlock(&pr->pr_mtx);
+ getcreddomainname(td->td_ucred, buf, sizeof(buf));
str = buf;
break;
==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#29 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1546 2009/06/12 15:44:35 vanhu Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1547 2009/06/15 18:22:41 marius Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1768,6 +1768,7 @@
# BCM570x family of controllers, including the 3Com 3c996-T,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list