Date: Wed, 24 Sep 2008 17:28:25 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 150390 for review Message-ID: <200809241728.m8OHSPY6071909@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150390 Change 150390 by hselasky@hselasky_laptop001 on 2008/09/24 17:27:57 IFC @ 150385 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/boot/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/usb/src/sys/cam/cam.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/usb/src/sys/conf/NOTES#19 integrate .. //depot/projects/usb/src/sys/conf/files#35 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#10 integrate .. //depot/projects/usb/src/sys/conf/files.i386#13 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#8 integrate .. //depot/projects/usb/src/sys/conf/files.mips#3 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips#3 integrate .. //depot/projects/usb/src/sys/conf/options.mips#2 integrate .. //depot/projects/usb/src/sys/conf/options.sparc64#4 integrate .. //depot/projects/usb/src/sys/ddb/db_command.c#5 integrate .. //depot/projects/usb/src/sys/ddb/ddb.h#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/usb/src/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mc5.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_config.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_include.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#7 integrate .. //depot/projects/usb/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_acpi.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppcreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/snp/snp.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#43 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#8 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#9 edit .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#10 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom_io.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/usb/src/sys/i386/i386/bios.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/usb/src/sys/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/usb/src/sys/i386/include/pmc_mdep.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#9 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/usb/src/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_pmc.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_priv.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_clist.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_rman.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#10 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#7 integrate .. //depot/projects/usb/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/conf/IDT#4 integrate .. //depot/projects/usb/src/sys/mips/idt/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/wlan/Makefile#6 integrate .. //depot/projects/usb/src/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/usb/src/sys/net/if_clone.c#3 integrate .. //depot/projects/usb/src/sys/net/if_clone.h#3 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#8 integrate .. //depot/projects/usb/src/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#8 integrate .. //depot/projects/usb/src/sys/net/route.c#10 integrate .. //depot/projects/usb/src/sys/net/route.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/usb/src/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/usb/src/sys/netipx/ipx.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs.h#6 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/aim/clock.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/cpufunc.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/usb/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/autoconf.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/usb/src/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psychoreg.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/usb/src/sys/sys/clist.h#3 integrate .. //depot/projects/usb/src/sys/sys/interrupt.h#7 integrate .. //depot/projects/usb/src/sys/sys/libkern.h#7 integrate .. //depot/projects/usb/src/sys/sys/mount.h#10 integrate .. //depot/projects/usb/src/sys/sys/param.h#14 integrate .. //depot/projects/usb/src/sys/sys/pmckern.h#3 integrate .. //depot/projects/usb/src/sys/sys/priv.h#8 integrate .. //depot/projects/usb/src/sys/sys/proc.h#11 integrate .. //depot/projects/usb/src/sys/sys/procfs.h#3 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#7 integrate .. //depot/projects/usb/src/sys/sys/tty.h#5 integrate .. //depot/projects/usb/src/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/usb/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/usb/src/sys/sys/ttyhook.h#1 branch .. //depot/projects/usb/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#10 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/ufs/ufs/dirhash.h#3 integrate .. //depot/projects/usb/src/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_inode.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#11 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#10 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -46,59 +46,60 @@ #include <machine/md_var.h> struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.159 2008/05/23 04:03:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.160 2008/09/18 18:51:32 stas Exp $"); #include "opt_cpu.h" @@ -249,8 +249,8 @@ "\030POPCNT" "\031<b24>" "\032<b25>" - "\033<b26>" - "\034<b27>" + "\033XSAVE" + "\034OSXSAVE" "\035<b28>" "\036<b29>" "\037<b30>" ==== //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Joseph Koshy + * Copyright (c) 2003-2008 Joseph Koshy * Copyright (c) 2007 The FreeBSD Foundation * All rights reserved. * @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.5 2008/06/20 05:22:09 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.6 2008/09/15 06:47:52 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -59,7 +59,8 @@ #define PMC_TRAPFRAME_TO_PC(TF) ((TF)->tf_rip) #define PMC_TRAPFRAME_TO_FP(TF) ((TF)->tf_rbp) -#define PMC_TRAPFRAME_TO_SP(TF) ((TF)->tf_rsp) +#define PMC_TRAPFRAME_TO_USER_SP(TF) ((TF)->tf_rsp) +#define PMC_TRAPFRAME_TO_KERNEL_SP(TF) ((TF)->tf_rsp) #define PMC_AT_FUNCTION_PROLOGUE_PUSH_BP(I) \ (((I) & 0xffffffff) == 0xe5894855) /* pushq %rbp; movq %rsp,%rbp */ ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -46,59 +46,60 @@ #include <machine/md_var.h> struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/usb/src/sys/boot/Makefile#6 (text+ko) ==== @@ -1,7 +1,11 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.34 2008/07/23 07:23:33 imp Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.35 2008/09/18 15:25:35 obrien Exp $ .include <bsd.own.mk> +.if ${MACHINE_ARCH} == "mips" +MK_FORTH=no # not yet +.endif + .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl ==== //depot/projects/usb/src/sys/boot/ofw/libofw/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.13 2008/09/19 19:49:58 sobomax Exp $ LIB= ofw INTERNALLIB= ==== //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_console.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.13 2008/02/06 22:04:28 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.15 2008/09/19 19:49:58 sobomax Exp $"); #include <sys/types.h> ==== //depot/projects/usb/src/sys/cam/cam.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam.h,v 1.12 2008/09/18 14:48:46 sbruno Exp $ */ #ifndef _CAM_CAM_H @@ -129,6 +129,7 @@ * requests for the target at the sim level * back into the XPT queue. */ + CAM_SCSI_IT_NEXUS_LOST, /* Initiator/Target Nexus lost. */ CAM_IDE = 0x33, /* Initiator Detected Error */ CAM_RESRC_UNAVAIL, /* Resource Unavailable */ CAM_UNACKED_EVENT, /* Unacknowledged Event by Host */ ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.3 2008/09/18 19:57:06 imp Exp $"); #include <sys/param.h> #include <sys/lock.h> @@ -74,7 +74,8 @@ return (newval); } -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) void atomic_or_8(volatile uint8_t *target, uint8_t value) { ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/atomic.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/atomic.h,v 1.4 2008/05/22 08:33:24 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.5 2008/09/18 19:57:06 imp Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ @@ -48,7 +48,8 @@ extern uint8_t atomic_or_8_nv(volatile uint8_t *target, uint8_t value); extern void membar_producer(void); -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) extern void atomic_or_8(volatile uint8_t *target, uint8_t value); #else static __inline void ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 (text+ko) ==== @@ -744,6 +744,7 @@ VN_RELE(*vpp); *vpp = NULL; } + ZFS_EXIT(zfsvfs); return (err); } ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#9 (text+ko) ==== @@ -25,18 +25,16 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.77 2008/07/10 19:54:34 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); #include "opt_compat.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/bus.h> #include <sys/clock.h> #include <sys/exec.h> #include <sys/fcntl.h> #include <sys/filedesc.h> -#include <sys/namei.h> #include <sys/imgact.h> #include <sys/kernel.h> #include <sys/limits.h> @@ -48,6 +46,7 @@ #include <sys/module.h> #include <sys/mount.h> #include <sys/mutex.h> +#include <sys/namei.h> #include <sys/proc.h> #include <sys/reboot.h> #include <sys/resource.h> @@ -65,6 +64,7 @@ #include <sys/sysctl.h> #include <sys/sysent.h> #include <sys/sysproto.h> +#include <sys/systm.h> #include <sys/thr.h> #include <sys/unistd.h> #include <sys/ucontext.h> @@ -85,6 +85,8 @@ #include <machine/cpu.h> +#include <security/audit/audit.h> + #include <compat/freebsd32/freebsd32_util.h> #include <compat/freebsd32/freebsd32.h> #include <compat/freebsd32/freebsd32_ipc.h> @@ -2552,14 +2554,58 @@ return (cpuset_setaffinity(td, &ap)); } +int +freebsd32_nmount(struct thread *td, + struct freebsd32_nmount_args /* { + struct iovec *iovp; + unsigned int iovcnt; + int flags; + } */ *uap) +{ + struct uio *auio; + struct iovec *iov; + int error, k; + + AUDIT_ARG(fflags, uap->flags); + + /* + * Filter out MNT_ROOTFS. We do not want clients of nmount() in + * userspace to set this flag, but we must filter it out if we want + * MNT_UPDATE on the root file system to work. + * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try(). + */ + uap->flags &= ~MNT_ROOTFS; + + /* + * check that we have an even number of iovec's + * and that we have at least two options. + */ + if ((uap->iovcnt & 1) || (uap->iovcnt < 4)) + return (EINVAL); + + error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); + if (error) + return (error); + for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) { + if (iov->iov_len > MMAXOPTIONLEN) { + free(auio, M_IOV); + return (EINVAL); + } + } + + error = vfs_donmount(td, uap->flags, auio); + free(auio, M_IOV); + return error; +} + #if 0 - int freebsd32_xxx(struct thread *td, struct freebsd32_xxx_args *uap) { - int error; struct yyy32 *p32, s32; struct yyy *p = NULL, s; + struct xxx_arg ap; + int error; if (uap->zzz) { error = copyin(uap->zzz, &s32, sizeof(s32)); @@ -2577,5 +2623,4 @@ } return (error); } - #endif ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#9 (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.89 2008/08/24 21:23:08 rwatson Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.92 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -63,6 +63,11 @@ char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; }; +struct freebsd32_ioctl_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char com_l_[PADL_(uint32_t)]; uint32_t com; char com_r_[PADR_(uint32_t)]; + char data_l_[PADL_(struct md_ioctl32 *)]; struct md_ioctl32 * data; char data_r_[PADR_(struct md_ioctl32 *)]; +}; struct freebsd32_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; @@ -241,6 +246,11 @@ char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)]; char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; +struct freebsd32_nmount_args { + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; + char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; struct freebsd32_sendfile_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; @@ -378,6 +388,7 @@ int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); +int freebsd32_ioctl(struct thread *, struct freebsd32_ioctl_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809241728.m8OHSPY6071909>