Date: Sat, 30 May 2009 16:23:28 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163093 for review Message-ID: <200905301623.n4UGNSH0068464@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163093 Change 163093 by thompsa@thompsa_burger on 2009/05/30 16:23:13 IFC Affected files ... .. //depot/projects/usb_buf/src/lib/libusb/libusb.3#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/usb_buf/src/sys/conf/NOTES#3 integrate .. //depot/projects/usb_buf/src/sys/conf/files.i386#4 integrate .. //depot/projects/usb_buf/src/sys/conf/options#3 integrate .. //depot/projects/usb_buf/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/si/si.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/usb_buf/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/usb_buf/src/sys/i386/xen/xen_rtc.c#2 integrate .. //depot/projects/usb_buf/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/tty.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/usb_buf/src/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/pfil.h#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/usb_buf/src/sys/nlm/nlm_advlock.c#3 integrate .. //depot/projects/usb_buf/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/usb_buf/src/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/usb_buf/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/usb_buf/src/sys/sys/jail.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/kernel.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/mount.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/namei.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/param.h#4 integrate .. //depot/projects/usb_buf/src/sys/sys/priv.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/sx.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/tty.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/vimage.h#4 integrate Differences ... ==== //depot/projects/usb_buf/src/lib/libusb/libusb.3#4 (text+ko) ==== @@ -774,7 +774,7 @@ the given USB device. . A timeout value can be specified which is passed on to the -.Xr 2 poll +.Xr poll 2 function. . .Sh USB BACKEND OPERATIONS ==== //depot/projects/usb_buf/src/sys/amd64/amd64/dump_machdep.c#2 (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/usb_buf/src/sys/amd64/amd64/minidump_machdep.c#2 (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/usb_buf/src/sys/arm/arm/dump_machdep.c#2 (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/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 (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/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 (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/usb_buf/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/usb_buf/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/usb_buf/src/sys/compat/linux/linux_misc.c#2 (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/usb_buf/src/sys/compat/ndis/subr_usbd.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.13 2009/05/28 17:36:36 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,8 +76,8 @@ #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 @@ -114,10 +114,10 @@ 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, +static usb_error_t usbd_setup_endpoint(irp *, uint8_t, struct usb_endpoint_descriptor *); -static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); -static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, +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 *); @@ -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; @@ -527,7 +527,7 @@ 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,7 +592,7 @@ 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; @@ -602,7 +602,7 @@ device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; InitializeListHead(&ne->ne_active); InitializeListHead(&ne->ne_pending); @@ -621,14 +621,14 @@ return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_default(ip, ifidx) irp *ip; uint8_t ifidx; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - usb2_error_t status; + usb_error_t status; if (ifidx > 0) device_printf(dev, "warning: ifidx > 0 isn't supported.\n"); @@ -643,7 +643,7 @@ return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint(ip, ifidx, ep) irp *ip; uint8_t ifidx; @@ -654,7 +654,7 @@ struct ndisusb_ep *ne; struct usb_config cfg; struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; /* check for non-supported transfer types */ if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_CONTROL || @@ -810,7 +810,7 @@ static void usbd_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *ne, - struct ndisusb_xfer *nx, usb2_error_t status) + struct ndisusb_xfer *nx, usb_error_t status) { struct ndisusb_xferdone *nd; uint8_t irql; @@ -1122,7 +1122,7 @@ struct usbd_urb_bulk_or_intr_transfer *ubi; struct usbd_urb_vendor_or_class_request *vcreq; union usbd_urb *urb; - usb2_error_t status; + usb_error_t status; void *priv; dev = sc->ndis_dev; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.46 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.47 2009/05/29 05:58:46 delphij Exp $"); #include "opt_mac.h" @@ -367,7 +367,7 @@ int svr4_sys_open(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_open_args *uap; { struct proc *p = td->td_proc; @@ -419,7 +419,7 @@ int svr4_sys_open64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_open64_args *uap; { return svr4_sys_open(td, (struct svr4_sys_open_args *)uap); @@ -427,7 +427,7 @@ int svr4_sys_creat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_creat_args *uap; { char *newpath; @@ -443,7 +443,7 @@ int svr4_sys_creat64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_creat64_args *uap; { return svr4_sys_creat(td, (struct svr4_sys_creat_args *)uap); @@ -451,7 +451,7 @@ int svr4_sys_llseek(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_llseek_args *uap; { struct lseek_args ap; @@ -472,7 +472,7 @@ int svr4_sys_access(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_access_args *uap; { char *newpath; @@ -487,7 +487,7 @@ #if defined(NOTYET) int svr4_sys_pread(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pread_args *uap; { struct pread_args pra; @@ -508,7 +508,7 @@ #if defined(NOTYET) int svr4_sys_pread64(td, v, retval) - register struct thread *td; + struct thread *td; void *v; register_t *retval; { @@ -532,7 +532,7 @@ #if defined(NOTYET) int svr4_sys_pwrite(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pwrite_args *uap; { struct pwrite_args pwa; @@ -553,7 +553,7 @@ #if defined(NOTYET) int svr4_sys_pwrite64(td, v, retval) - register struct thread *td; + struct thread *td; void *v; register_t *retval; { @@ -575,7 +575,7 @@ int svr4_sys_fcntl(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_fcntl_args *uap; { int cmd, error, *retval; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_ioctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.25 2009/05/08 20:06:37 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.26 2009/05/29 05:58:46 delphij Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -79,7 +79,7 @@ int svr4_sys_ioctl(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_ioctl_args *uap; { int *retval; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_misc.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.104 2009/05/20 18:36:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.108 2009/05/29 05:58:46 delphij Exp $"); #include "opt_mac.h" @@ -121,7 +121,7 @@ #if defined(BOGUS) int svr4_sys_setitimer(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setitimer_args *uap; { td->td_retval[0] = 0; @@ -231,7 +231,7 @@ struct thread *td; struct svr4_sys_getdents64_args *uap; { - register struct dirent *bdp; + struct dirent *bdp; struct vnode *vp; caddr_t inp, buf; /* BSD-format */ int len, reclen; /* BSD-format */ @@ -370,7 +370,7 @@ svr4_dirent.d_off = (svr4_off_t)(off + reclen); svr4_dirent.d_reclen = (u_short) svr4reclen; } - strcpy(svr4_dirent.d_name, bdp->d_name); + strlcpy(svr4_dirent.d_name, bdp->d_name, sizeof(svr4_dirent.d_name)); if ((error = copyout((caddr_t)&svr4_dirent, outp, svr4reclen))) goto out; inp += reclen; @@ -487,7 +487,10 @@ reclen = bdp->d_reclen; if (reclen & 3) panic("svr4_sys_getdents64: bad reclen"); - off = *cookie++; /* each entry points to the next */ + if (cookie) + off = *cookie++; /* each entry points to the next */ + else + off += reclen; if ((off >> 32) != 0) { uprintf("svr4_sys_getdents64: dir offset too large for emulated program"); error = EINVAL; @@ -511,7 +514,7 @@ idb.d_ino = (svr4_ino_t)bdp->d_fileno; idb.d_off = (svr4_off_t)off; idb.d_reclen = (u_short)svr4_reclen; - strcpy(idb.d_name, bdp->d_name); + strlcpy(idb.d_name, bdp->d_name, sizeof(idb.d_name)); if ((error = copyout((caddr_t)&idb, outp, svr4_reclen))) goto out; /* advance past this real entry */ @@ -665,7 +668,7 @@ int svr4_sys_mknod(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_mknod_args *uap; { int *retval = td->td_retval; @@ -706,9 +709,6 @@ retval = &(td->td_retval[0]); switch (uap->name) { - case SVR4_CONFIG_UNUSED: - *retval = 0; - break; case SVR4_CONFIG_NGROUPS: *retval = NGROUPS_MAX; break; @@ -788,7 +788,45 @@ #endif break; #endif /* NOTYET */ - + case SVR4_CONFIG_COHERENCY: + *retval = 0; /* XXX */ + break; + case SVR4_CONFIG_SPLIT_CACHE: + *retval = 0; /* XXX */ + break; + case SVR4_CONFIG_ICACHESZ: + *retval = 256; /* XXX */ + break; + case SVR4_CONFIG_DCACHESZ: + *retval = 256; /* XXX */ + break; + case SVR4_CONFIG_ICACHELINESZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHELINESZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_ICACHEBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHEBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHETBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_ICACHE_ASSOC: + *retval = 1; /* XXX */ + break; + case SVR4_CONFIG_DCACHE_ASSOC: + *retval = 1; /* XXX */ + break; + case SVR4_CONFIG_MAXPID: + *retval = PID_MAX; + break; + case SVR4_CONFIG_STACK_PROT: + *retval = PROT_READ|PROT_WRITE|PROT_EXEC; + break; default: return EINVAL; } ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_resource.c#2 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.18 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.19 2009/05/29 05:58:46 delphij Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -127,7 +127,7 @@ int svr4_sys_getrlimit(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_getrlimit_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -174,7 +174,7 @@ int svr4_sys_setrlimit(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setrlimit_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -225,7 +225,7 @@ int svr4_sys_getrlimit64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_getrlimit64_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -272,7 +272,7 @@ int svr4_sys_setrlimit64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setrlimit64_args *uap; { int rl = svr4_to_native_rl(uap->which); ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_signal.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.35 2005/09/28 07:03:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.36 2009/05/29 05:58:46 delphij Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -259,7 +259,7 @@ int svr4_sys_sigaction(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigaction_args *uap; { struct svr4_sigaction isa; @@ -301,7 +301,7 @@ int svr4_sys_sigaltstack(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigaltstack_args *uap; { struct svr4_sigaltstack sss; @@ -328,7 +328,7 @@ */ int svr4_sys_signal(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_signal_args *uap; { struct proc *p; @@ -493,7 +493,7 @@ int svr4_sys_sigsuspend(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigsuspend_args *uap; { svr4_sigset_t sss; @@ -510,7 +510,7 @@ int svr4_sys_kill(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_kill_args *uap; { struct kill_args ka; @@ -525,7 +525,7 @@ int svr4_sys_context(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_context_args *uap; { struct svr4_ucontext uc; @@ -565,7 +565,7 @@ int svr4_sys_pause(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pause_args *uap; { sigset_t mask; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_socket.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.27 2006/07/21 20:40:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.28 2009/05/29 06:04:26 delphij Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -120,7 +120,8 @@ struct stat *st; { struct svr4_sockcache_entry *e; - int len, error; + size_t len; + int error; e = malloc(sizeof(*e), M_TEMP, M_WAITOK); e->cookie = NULL; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.26 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.30 2009/05/29 21:27:12 jamie Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -43,7 +43,6 @@ #include <sys/sysctl.h> #include <sys/sysproto.h> #include <sys/un.h> -#include <sys/vimage.h> #include <vm/vm.h> @@ -185,7 +184,7 @@ int svr4_sys_lstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_lstat_args *uap; { struct svr4_stat svr4_st; @@ -210,7 +209,7 @@ int svr4_sys_fstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_fstat_args *uap; { struct svr4_stat svr4_st; @@ -228,7 +227,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905301623.n4UGNSH0068464>