Date: Sun, 31 May 2009 16:53:57 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163177 for review Message-ID: <200905311653.n4VGrvAx009828@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163177 Change 163177 by zec@zec_tpx32 on 2009/05/31 16:53:29 IFC @ 163176 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#26 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#38 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#19 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#13 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#28 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/si/si.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smc/if_smc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudioreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbhid.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uathvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vr/if_vr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsport.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/clock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_rtc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_osd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rmlock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#48 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#8 integrate .. //depot/projects/vimage-commit2/src/sys/kgssapi/gsstest.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#23 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#69 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/net/pfil.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_dfs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_advlock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rl.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/pmu.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/xdr.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/cpu.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/jail.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kernel.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/sys/namei.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#40 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sockio.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sx.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/tty.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#69 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#8 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -34,7 +34,6 @@ #include <sys/sysctl.h> #include <sys/kernel.h> #include <sys/kerneldump.h> -#include <sys/vimage.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/elf.h> ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#13 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -34,7 +34,6 @@ #include <sys/kernel.h> #include <sys/kerneldump.h> #include <sys/msgbuf.h> -#include <sys/vimage.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/atomic.h> ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.7 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.8 2009/05/29 21:27:12 jamie Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -35,7 +35,6 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/kerneldump.h> -#include <sys/vimage.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/elf.h> ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.17 2009/05/30 18:23:55 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -229,7 +229,7 @@ static void npe_txdone(int qid, void *arg); static int npe_rxbuf_init(struct npe_softc *, struct npebuf *, struct mbuf *); -static void npe_rxdone(int qid, void *arg); +static int npe_rxdone(int qid, void *arg); static void npeinit(void *); static void npestart_locked(struct ifnet *); static void npestart(struct ifnet *); @@ -777,7 +777,7 @@ */ sc->rx_qid = npeconfig[sc->sc_npeid].rx_qid; ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); + IX_QMGR_Q_SOURCE_ID_NOT_E, (qconfig_hand_t *)npe_rxdone, sc); sc->rx_freeqid = npeconfig[sc->sc_npeid].rx_freeqid; ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* @@ -1091,7 +1091,7 @@ * from the hardware queue and pass the frames up the * stack. Pass the rx buffers to the free list. */ -static void +static int npe_rxdone(int qid, void *arg) { #define P2V(a, dma) \ @@ -1099,6 +1099,7 @@ struct npe_softc *sc = arg; struct npedma *dma = &sc->rxdma; uint32_t entry; + int rx_npkts = 0; while (ixpqmgr_qread(qid, &entry) == 0) { struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma); @@ -1132,6 +1133,7 @@ ifp->if_ipackets++; ifp->if_input(ifp, mrx); + rx_npkts++; } else { /* discard frame and re-use mbuf */ m = npe->ix_m; @@ -1143,19 +1145,22 @@ /* XXX should not happen */ } } + return rx_npkts; #undef P2V } #ifdef DEVICE_POLLING -static void +static int npe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct npe_softc *sc = ifp->if_softc; + int rx_npkts = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - npe_rxdone(sc->rx_qid, sc); + rx_npkts = npe_rxdone(sc->rx_qid, sc); npe_txdone(sc->tx_doneqid, sc); /* XXX polls both NPE's */ } + return rx_npkts; } #endif /* DEVICE_POLLING */ ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.5 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.6 2009/05/30 15:14:44 attilio Exp $"); /* * Intel XScale Queue Manager support. @@ -338,7 +338,7 @@ int ixpqmgr_qconfig(int qId, int qEntries, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg) + qconfig_hand_t *cb, void *cbarg) { struct ixpqmgr_softc *sc = ixpqmgr_sc; struct qmgrInfo *qi = &sc->qinfo[qId]; ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.1 2006/11/19 23:55:23 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.2 2009/05/30 15:14:44 attilio Exp $ */ /*- @@ -229,8 +229,10 @@ #define IX_QMGR_ENTRY2_OFFSET 1 #define IX_QMGR_ENTRY4_OFFSET 3 +typedef void qconfig_hand_t(int, void *); + int ixpqmgr_qconfig(int qId, int qSizeInWords, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg); + qconfig_hand_t *cb, void *cbarg); int ixpqmgr_qwrite(int qId, uint32_t entry); int ixpqmgr_qread(int qId, uint32_t *entry); int ixpqmgr_qreadm(int qId, uint32_t n, uint32_t *p); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.7 2008/11/19 17:34:28 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.8 2009/05/30 19:28:38 marcel Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -46,12 +46,6 @@ #include "glue.h" #include "libuboot.h" -#define NETIF_DEBUG -#define NETIF_VERBOSE_DEBUG -#undef NETIF_DEBUG -#undef NETIF_VERBOSE_DEBUG - - static int net_probe(struct netif *, void *); static int net_match(struct netif *, void *); static void net_init(struct iodesc *, void *); @@ -138,7 +132,7 @@ #if defined(NETIF_DEBUG) struct ether_header *eh; - printf("net_put: desc 0x%x, pkt 0x%x, len %d\n", desc, pkt, len); + printf("net_put: desc %p, pkt %p, len %d\n", desc, pkt, len); eh = pkt; printf("dst: %s ", ether_sprintf(eh->ether_dhost)); printf("src: %s ", ether_sprintf(eh->ether_shost)); @@ -175,7 +169,7 @@ int err, rlen; #if defined(NETIF_DEBUG) - printf("net_get: pkt %x, len %d, timeout %d\n", pkt, len, timeout); + printf("net_get: pkt %p, len %d, timeout %d\n", pkt, len, timeout); #endif t = getsecs(); do { ==== //depot/projects/vimage-commit2/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.2 2009/05/08 14:11:06 zec Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $ * */ @@ -31,11 +31,11 @@ #include <sys/conf.h> #include <sys/cpuvar.h> #include <sys/errno.h> +#include <sys/jail.h> #include <sys/kernel.h> #include <sys/misc.h> #include <sys/module.h> #include <sys/mutex.h> -#include <sys/vimage.h> cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; @@ -83,7 +83,7 @@ switch (type) { case MOD_LOAD: - utsname.nodename = G_hostname; + utsname.nodename = prison0.pr_host; break; case MOD_UNLOAD: ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#5 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.5 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.6 2009/05/29 21:27:12 jamie Exp $"); #include <sys/param.h> +#include <sys/jail.h> #include <sys/kernel.h> #include <sys/libkern.h> #include <sys/limits.h> @@ -57,7 +58,7 @@ { if (str == hw_serial) { - *result = hostid; + *result = prison0.pr_hostid; return (0); } ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 (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/cddl/compat/opensolaris/sys/mutex.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -47,9 +47,9 @@ typedef struct sx kmutex_t; #ifndef DEBUG -#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define MUTEX_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK) #endif #define mutex_init(lock, desc, type, arg) do { \ ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 (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/cddl/compat/opensolaris/sys/rwlock.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -49,9 +49,9 @@ typedef struct sx krwlock_t; #ifndef DEBUG -#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define RW_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK) #endif #define RW_READ_HELD(x) (rw_read_held((x))) ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 (text+ko) ==== @@ -564,8 +564,13 @@ if (fp->gfs_parent == NULL || (vp->v_flag & V_XATTRDIR)) goto found; - dp = fp->gfs_parent->v_data; - + /* + * XXX cope with a FreeBSD-specific race wherein the parent's + * snapshot data can be freed before the parent is + */ + if ((dp = fp->gfs_parent->v_data) == NULL) + return (NULL); + /* * First, see if this vnode is cached in the parent. */ ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 (text+ko) ==== @@ -2392,13 +2392,23 @@ /* * Check the vdev configuration to ensure that it's capable of supporting - * a root pool. Currently, we do not support RAID-Z or partial configuration. - * In addition, only a single top-level vdev is allowed and none of the leaves - * can be wholedisks. + * a root pool. + * + * On Solaris, we do not support RAID-Z or partial configuration. In + * addition, only a single top-level vdev is allowed and none of the + * leaves can be wholedisks. + * + * For FreeBSD, we can boot from any configuration. There is a + * limitation that the boot filesystem must be either uncompressed or + * compresses with lzjb compression but I'm not sure how to enforce + * that here. */ boolean_t vdev_is_bootable(vdev_t *vd) { +#ifdef __FreeBSD_version + return (B_TRUE); +#else int c; if (!vd->vdev_ops->vdev_op_leaf) { @@ -2420,4 +2430,5 @@ return (B_FALSE); } return (B_TRUE); +#endif } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 (text+ko) ==== @@ -3121,3 +3121,4 @@ }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); +MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1); ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.236 2009/05/10 18:43:43 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -64,7 +64,6 @@ #include <sys/vnode.h> #include <sys/wait.h> #include <sys/cpuset.h> -#include <sys/vimage.h> #include <security/mac/mac_framework.h> @@ -715,10 +714,10 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; + struct prison *pr; char *p; #ifdef DEBUG @@ -741,9 +740,10 @@ } strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); - mtx_unlock(&hostname_mtx); + 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/vimage-commit2/src/sys/compat/linux/linux_socket.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.92 2009/05/19 09:10:53 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.95 2009/05/31 12:16:31 dchagin Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -445,8 +445,6 @@ return (-1); } - - static int linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr) { @@ -477,6 +475,24 @@ } static int +linux_set_socket_flags(struct thread *td, int s, int flags) +{ + int error; + + if (flags & LINUX_SOCK_NONBLOCK) { + error = kern_fcntl(td, s, F_SETFL, O_NONBLOCK); + if (error) + return (error); + } + if (flags & LINUX_SOCK_CLOEXEC) { + error = kern_fcntl(td, s, F_SETFD, FD_CLOEXEC); + if (error) + return (error); + } + return (0); +} + +static int linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct mbuf *control, enum uio_seg segflg) { @@ -610,21 +626,11 @@ if (retval_socket) return (retval_socket); - if (socket_flags & LINUX_SOCK_NONBLOCK) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFL, O_NONBLOCK); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } - } - if (socket_flags & LINUX_SOCK_CLOEXEC) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFD, FD_CLOEXEC); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } + retval_socket = linux_set_socket_flags(td, td->td_retval[0], + socket_flags); + if (retval_socket) { + (void)kern_close(td, td->td_retval[0]); + goto out; } if (bsd_args.type == SOCK_RAW @@ -878,12 +884,20 @@ int protocol; int *rsv; } */ bsd_args; + int error, socket_flags; + int sv[2]; bsd_args.domain = linux_to_bsd_domain(args->domain); if (bsd_args.domain != PF_LOCAL) return (EAFNOSUPPORT); - bsd_args.type = args->type; + socket_flags = args->type & ~LINUX_SOCK_TYPE_MASK; + if (socket_flags & ~(LINUX_SOCK_CLOEXEC | LINUX_SOCK_NONBLOCK)) + return (EINVAL); + bsd_args.type = args->type & LINUX_SOCK_TYPE_MASK; + if (bsd_args.type < 0 || bsd_args.type > LINUX_SOCK_MAX) + return (EINVAL); + if (args->protocol != 0 && args->protocol != PF_UNIX) /* @@ -896,7 +910,25 @@ else bsd_args.protocol = 0; bsd_args.rsv = (int *)PTRIN(args->rsv); - return (socketpair(td, &bsd_args)); + error = kern_socketpair(td, bsd_args.domain, bsd_args.type, + bsd_args.protocol, sv); + if (error) + return (error); + error = linux_set_socket_flags(td, sv[0], socket_flags); + if (error) + goto out; + error = linux_set_socket_flags(td, sv[1], socket_flags); + if (error) + goto out; + + error = copyout(sv, bsd_args.rsv, 2 * sizeof(int)); + +out: + if (error) { + (void)kern_close(td, sv[0]); + (void)kern_close(td, sv[1]); + } + return (error); } struct linux_send_args { ==== //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.12 2009/04/05 18:20:38 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.14 2009/05/29 18:46:57 thompsa Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,18 +76,18 @@ #include <dev/if_ndis/if_ndisvar.h> static driver_object usbd_driver; -static usb2_callback_t usbd_non_isoc_callback; -static usb2_callback_t usbd_ctrl_callback; +static usb_callback_t usbd_non_isoc_callback; +static usb_callback_t usbd_ctrl_callback; #define USBD_CTRL_READ_PIPE 0 #define USBD_CTRL_WRITE_PIPE 1 #define USBD_CTRL_MAX_PIPE 2 #define USBD_CTRL_READ_BUFFER_SP 256 #define USBD_CTRL_READ_BUFFER_SIZE \ - (sizeof(struct usb2_device_request) + USBD_CTRL_READ_BUFFER_SP) + (sizeof(struct usb_device_request) + USBD_CTRL_READ_BUFFER_SP) #define USBD_CTRL_WRITE_BUFFER_SIZE \ - (sizeof(struct usb2_device_request)) -static struct usb2_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { + (sizeof(struct usb_device_request)) +static struct usb_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { [USBD_CTRL_READ_PIPE] = { .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ @@ -114,11 +114,11 @@ static int32_t usbd_func_vendorclass(irp *); static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_abort_pipe(irp *); -static usb2_error_t usbd_setup_endpoint(irp *, uint8_t, - struct usb2_endpoint_descriptor *); -static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); -static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, - struct ndisusb_ep *, struct usb2_config *); +static usb_error_t usbd_setup_endpoint(irp *, uint8_t, + struct usb_endpoint_descriptor *); +static usb_error_t usbd_setup_endpoint_default(irp *, uint8_t); +static usb_error_t usbd_setup_endpoint_one(irp *, uint8_t, + struct ndisusb_ep *, struct usb_config *); static int32_t usbd_func_getdesc(irp *); static union usbd_urb *usbd_geturb(irp *); static struct ndisusb_ep*usbd_get_ndisep(irp *, usb_endpoint_descriptor_t *); @@ -353,7 +353,7 @@ return (STATUS_FAILURE); } -/* Convert FreeBSD's usb2_error_t to USBD_STATUS */ +/* Convert FreeBSD's usb_error_t to USBD_STATUS */ static int32_t usbd_usb2urb(int status) { @@ -463,7 +463,7 @@ uint32_t len; union usbd_urb *urb; usb_config_descriptor_t *cdp; - usb2_error_t status; + usb_error_t status; urb = usbd_geturb(ip); ctldesc = &urb->uu_ctldesc; @@ -519,15 +519,15 @@ device_t dev = IRP_NDIS_DEV(ip); int i, j; struct ndis_softc *sc = device_get_softc(dev); - struct usb2_device *udev = sc->ndisusb_dev; - struct usb2_pipe *p = NULL; + struct usb_device *udev = sc->ndisusb_dev; + struct usb_pipe *p = NULL; struct usbd_interface_information *intf; struct usbd_pipe_information *pipe; struct usbd_urb_select_configuration *selconf; union usbd_urb *urb; usb_config_descriptor_t *conf; usb_endpoint_descriptor_t *edesc; - usb2_error_t ret; + usb_error_t ret; urb = usbd_geturb(ip); @@ -592,17 +592,17 @@ return USBD_STATUS_SUCCESS; } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_one(ip, ifidx, ne, epconf) irp *ip; uint8_t ifidx; struct ndisusb_ep *ne; - struct usb2_config *epconf; + struct usb_config *epconf; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - struct usb2_xfer *xfer; - usb2_error_t status; + struct usb_xfer *xfer; + usb_error_t status; InitializeListHead(&ne->ne_active); InitializeListHead(&ne->ne_pending); @@ -621,14 +621,14 @@ return (status); } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905311653.n4VGrvAx009828>