Date: Mon, 6 Aug 2012 23:05:32 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r239113 - in projects/fuse: etc/devd include/gssapi lib/libpam/modules/pam_krb5 lib/libpam/modules/pam_unix libexec/rtld-elf libexec/rtld-elf/arm sbin/camcontrol sbin/geom/class/virstor... Message-ID: <201208062305.q76N5WFN093122@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Mon Aug 6 23:05:32 2012 New Revision: 239113 URL: http://svn.freebsd.org/changeset/base/239113 Log: MFC Added: projects/fuse/sys/boot/common/part.c - copied unchanged from r239112, head/sys/boot/common/part.c projects/fuse/sys/boot/common/part.h - copied unchanged from r239112, head/sys/boot/common/part.h projects/fuse/sys/powerpc/powermac/nvbl.c - copied unchanged from r239112, head/sys/powerpc/powermac/nvbl.c projects/fuse/tools/tools/bootparttest/ - copied from r239112, head/tools/tools/bootparttest/ Modified: projects/fuse/etc/devd/usb.conf projects/fuse/include/gssapi/gssapi.h projects/fuse/lib/libpam/modules/pam_krb5/pam_krb5.c projects/fuse/lib/libpam/modules/pam_unix/pam_unix.c projects/fuse/libexec/rtld-elf/arm/rtld_start.S projects/fuse/libexec/rtld-elf/map_object.c projects/fuse/sbin/camcontrol/camcontrol.c projects/fuse/sbin/geom/class/virstor/gvirstor.8 projects/fuse/sbin/ggate/shared/ggate.h projects/fuse/share/man/man4/hptiop.4 projects/fuse/share/man/man4/polling.4 projects/fuse/share/man/man4/umodem.4 projects/fuse/share/man/man4/uslcom.4 projects/fuse/share/man/man5/rc.conf.5 projects/fuse/sys/amd64/amd64/pmap.c projects/fuse/sys/arm/arm/bcopyinout.S projects/fuse/sys/arm/arm/bcopyinout_xscale.S projects/fuse/sys/arm/arm/exception.S projects/fuse/sys/arm/arm/pmap.c projects/fuse/sys/boot/common/Makefile.inc projects/fuse/sys/boot/common/disk.c projects/fuse/sys/boot/common/disk.h projects/fuse/sys/boot/i386/libi386/Makefile projects/fuse/sys/boot/i386/libi386/biosdisk.c projects/fuse/sys/boot/i386/libi386/devicename.c projects/fuse/sys/boot/i386/libi386/libi386.h projects/fuse/sys/boot/i386/loader/Makefile projects/fuse/sys/boot/i386/loader/main.c projects/fuse/sys/boot/i386/pmbr/pmbr.s projects/fuse/sys/boot/pc98/boot2/boot2.c projects/fuse/sys/boot/pc98/btx/btxldr/btxldr.S projects/fuse/sys/boot/pc98/btx/lib/btxcsu.S projects/fuse/sys/boot/pc98/cdboot/cdboot.S projects/fuse/sys/boot/pc98/libpc98/Makefile projects/fuse/sys/boot/userboot/test/test.c projects/fuse/sys/boot/userboot/userboot.h projects/fuse/sys/boot/userboot/userboot/Makefile projects/fuse/sys/boot/userboot/userboot/bootinfo32.c projects/fuse/sys/boot/userboot/userboot/copy.c projects/fuse/sys/boot/userboot/userboot/devicename.c projects/fuse/sys/boot/userboot/userboot/main.c projects/fuse/sys/boot/userboot/userboot/userboot_disk.c projects/fuse/sys/boot/zfs/zfs.c projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/fuse/sys/conf/files.powerpc projects/fuse/sys/conf/kern.post.mk projects/fuse/sys/dev/agp/agp.c projects/fuse/sys/dev/agp/agp_i810.c projects/fuse/sys/dev/aic7xxx/aic79xx_osm.c projects/fuse/sys/dev/aic7xxx/aic_osm_lib.c projects/fuse/sys/dev/ath/ah_osdep.h projects/fuse/sys/dev/ath/ath_hal/ah.h projects/fuse/sys/dev/ath/ath_hal/ar5210/ar5210.h projects/fuse/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c projects/fuse/sys/dev/ath/ath_hal/ar5211/ar5211.h projects/fuse/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c projects/fuse/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/fuse/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/fuse/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/fuse/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/fuse/sys/dev/ath/if_ath_beacon.c projects/fuse/sys/dev/ath/if_ath_rx.c projects/fuse/sys/dev/ath/if_ath_rx_edma.c projects/fuse/sys/dev/ath/if_ath_tx.c projects/fuse/sys/dev/ath/if_athvar.h projects/fuse/sys/dev/bce/if_bce.c projects/fuse/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/fuse/sys/dev/cxgbe/firmware/t4fw_interface.h projects/fuse/sys/dev/e1000/if_igb.c projects/fuse/sys/dev/esp/ncr53c9x.c projects/fuse/sys/dev/hptiop/hptiop.c projects/fuse/sys/dev/isp/isp_sbus.c projects/fuse/sys/dev/md/md.c projects/fuse/sys/dev/pci/pci_pci.c projects/fuse/sys/dev/puc/pucdata.c projects/fuse/sys/dev/usb/serial/uftdi.c projects/fuse/sys/dev/usb/serial/uftdi_reg.h projects/fuse/sys/dev/usb/serial/uslcom.c projects/fuse/sys/dev/usb/usbdevs projects/fuse/sys/fs/nfs/nfs_commonport.c projects/fuse/sys/fs/nfsclient/nfs_clbio.c projects/fuse/sys/fs/nwfs/nwfs_io.c projects/fuse/sys/fs/smbfs/smbfs_io.c projects/fuse/sys/fs/tmpfs/tmpfs_subr.c projects/fuse/sys/fs/tmpfs/tmpfs_vnops.c projects/fuse/sys/geom/virstor/g_virstor.c projects/fuse/sys/ia64/ia64/pmap.c projects/fuse/sys/kern/kern_clocksource.c projects/fuse/sys/kern/kern_intr.c projects/fuse/sys/kern/kern_proc.c projects/fuse/sys/kern/subr_uio.c projects/fuse/sys/kern/uipc_syscalls.c projects/fuse/sys/net/bpf_zerocopy.c projects/fuse/sys/netinet/ipfw/ip_dn_io.c projects/fuse/sys/netinet/ipfw/ip_fw_log.c projects/fuse/sys/netinet/sctp_bsd_addr.c projects/fuse/sys/netinet/sctp_input.c projects/fuse/sys/netinet/sctp_pcb.c projects/fuse/sys/netinet/tcp_timer.c projects/fuse/sys/nfsclient/nfs_bio.c projects/fuse/sys/ofed/include/linux/gfp.h projects/fuse/sys/powerpc/conf/GENERIC projects/fuse/sys/powerpc/conf/GENERIC64 projects/fuse/sys/sparc64/include/pmap.h projects/fuse/sys/sparc64/sparc64/pmap.c projects/fuse/sys/sys/bus.h projects/fuse/sys/ufs/ffs/ffs_vnops.c projects/fuse/sys/vm/device_pager.c projects/fuse/sys/vm/sg_pager.c projects/fuse/sys/vm/vm_page.c projects/fuse/sys/vm/vm_page.h projects/fuse/sys/vm/vnode_pager.c projects/fuse/sys/x86/x86/busdma_machdep.c projects/fuse/usr.bin/make/var.c projects/fuse/usr.sbin/ctladm/ctladm.c projects/fuse/usr.sbin/portsnap/portsnap/portsnap.8 projects/fuse/usr.sbin/portsnap/portsnap/portsnap.sh Directory Properties: projects/fuse/ (props changed) projects/fuse/sbin/ (props changed) projects/fuse/share/man/man4/ (props changed) projects/fuse/sys/ (props changed) projects/fuse/sys/boot/ (props changed) projects/fuse/sys/cddl/contrib/opensolaris/ (props changed) projects/fuse/sys/conf/ (props changed) Modified: projects/fuse/etc/devd/usb.conf ============================================================================== --- projects/fuse/etc/devd/usb.conf Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/etc/devd/usb.conf Mon Aug 6 23:05:32 2012 (r239113) @@ -157,7 +157,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0403"; - match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)"; + match "product" "(0x6001|0x6004|0x6006|0x6010|0x6011|0x6014|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeee c|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)"; action "kldload -n uftdi"; }; @@ -293,7 +293,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0411"; - match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2)"; + match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2|0x01ee)"; action "kldload -n if_run"; }; @@ -324,6 +324,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0456"; + match "product" "(0xf000|0xf001)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x045a"; match "product" "(0x5001|0x5002)"; action "kldload -n urio"; @@ -1021,7 +1029,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x05c6"; - match "product" "(0x1000|0x6000|0x6613|0x9000)"; + match "product" "(0x1000|0x6000|0x6613|0x9000|0x9204|0x9205)"; action "kldload -n u3g"; }; @@ -1068,6 +1076,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0647"; + match "product" "0x0100"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x066b"; match "product" "(0x200c|0x2202)"; action "kldload -n if_aue"; @@ -1109,7 +1125,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x067b"; - match "product" "(0x04bb|0x0609|0x0611|0x0612|0x1234|0x206a|0x2303)"; + match "product" "(0x0307|0x04bb|0x0609|0x0611|0x0612|0x1234|0x206a|0x2303)"; action "kldload -n uplcom"; }; @@ -1156,6 +1172,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x06ce"; + match "product" "0x8311"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x06e1"; match "product" "(0x0008|0x0009)"; action "kldload -n if_kue"; @@ -1301,7 +1325,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0789"; - match "product" "(0x0162|0x0163|0x0164|0x0166)"; + match "product" "(0x0162|0x0163|0x0164|0x0166|0x0168)"; action "kldload -n if_run"; }; @@ -1653,7 +1677,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0856"; - match "product" "0xac01"; + match "product" "(0xac01|0xac02|0xac03|0xac11|0xac12|0xac16|0xac17|0xac18|0xac19|0xac25|0xac26|0xac27|0xac33|0xac34|0xac49|0xac50|0xba02)"; action "kldload -n uftdi"; }; @@ -1876,6 +1900,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0acd"; + match "product" "0x0300"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0ace"; match "product" "(0x1211|0x1215)"; action "kldload -n if_zyd"; @@ -2045,6 +2077,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0b39"; + match "product" "0x0103"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0b39"; match "product" "0x0109"; action "kldload -n if_aue"; }; @@ -2172,6 +2212,22 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0c26"; + match "product" "(0x0004|0x0009|0x000a|0x000b|0x000c|0x000d|0x0010|0x0011|0x0012|0x0013|0x0018)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0c33"; + match "product" "0x0010"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0c44"; match "product" "0x03a2"; action "kldload -n uipaq"; @@ -2180,6 +2236,30 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0c52"; + match "product" "(0x2101|0x2102|0x2103|0x2104|0x2211|0x2212|0x2213|0x2221|0x2222|0x2223|0x2411|0x2412|0x2413|0x2421|0x2422|0x2423|0x2431|0x2432|0x2433|0x2441|0x2442|0x2443|0x2811|0x2812|0x2813|0x2821|0x2822|0x2823|0x2831|0x2832|0x2833|0x2841|0x2842|0x2843|0x2851|0x2852|0x2853|0x2861|0x2862|0x2863|0x2871|0x2872|0x2873|0x2881|0x2882|0x2883|0x9020)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0c6c"; + match "product" "0x04b2"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0c7d"; + match "product" "0x0005"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0c88"; match "product" "0x17da"; action "kldload -n u3g"; @@ -2276,6 +2356,22 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0d3a"; + match "product" "0x0300"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x0d46"; + match "product" "(0x2020|0x2021)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0d8e"; match "product" "0x3762"; action "kldload -n if_upgt"; @@ -2340,6 +2436,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0dcd"; + match "product" "0x0001"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0df6"; match "product" "0x000d"; action "kldload -n if_urtw"; @@ -2557,7 +2661,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0f94"; - match "product" "0x0001"; + match "product" "(0x0001|0x0005)"; action "kldload -n uftdi"; }; @@ -2588,6 +2692,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0fd8"; + match "product" "0x0001"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0fe6"; match "product" "(0x8101|0x9700)"; action "kldload -n if_udav"; @@ -2612,6 +2724,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x103e"; + match "product" "0x03e8"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1044"; match "product" "0x8001"; action "kldload -n if_ural"; @@ -2725,7 +2845,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x10c4"; - match "product" "(0x8066|0x806f|0x807a|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x818b|0x819f|0x81a6|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x8411|0x846e|0x8477|0xea60|0xea61|0xea71|0xf001|0xf002|0xf003|0xf004)"; + match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x8664|0x8665|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)"; action "kldload -n uslcom"; }; @@ -2900,6 +3020,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1209"; + match "product" "(0x1002|0x1006)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1231"; match "product" "(0xce01|0xce02)"; action "kldload -n uipaq"; @@ -2916,6 +3044,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x128d"; + match "product" "0x0001"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x129b"; match "product" "0x1666"; action "kldload -n if_zyd"; @@ -2933,7 +3069,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x12d1"; - match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1465|0x14ac|0x1520|0x1c05|0x1c0b)"; + match "product" "(0x1001|0x1003|0x1004|0x1401|0x1402|0x1403|0x1404|0x1405|0x1406|0x1407|0x1408|0x1409|0x140a|0x140b|0x140c|0x140d|0x140e|0x140f|0x1410|0x1411|0x1412|0x1413|0x1414|0x1415|0x1416|0x1417|0x1418|0x1419|0x141a|0x141b|0x141c|0x141d|0x141e|0x141f|0x1420|0x1421|0x1422|0x1423|0x1424|0x1425|0x1426|0x1427|0x1428|0x1429|0x142a|0x142b|0x142c|0x142d|0x142e|0x142f|0x1430|0x1431|0x1432|0x1433|0x1434|0x1435|0x1436|0x1437|0x1438|0x1439|0x143a|0x143b|0x143c|0x143d|0x143e|0x143f|0x1446|0x1465|0x14ac|0x14fe|0x1505|0x1506|0x1520|0x1803|0x1c05|0x1c0b)"; action "kldload -n u3g"; }; @@ -2949,6 +3085,14 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x1342"; + match "product" "0x0202"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x1342"; match "product" "0x0204"; action "kldload -n if_kue"; }; @@ -3108,6 +3252,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1457"; + match "product" "(0x5118|0x5118)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1472"; match "product" "0x0009"; action "kldload -n if_rum"; @@ -3332,6 +3484,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x15ba"; + match "product" "(0x0003|0x002b)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x15c5"; match "product" "0x0008"; action "kldload -n if_run"; @@ -3381,7 +3541,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x166a"; - match "product" "0x0303"; + match "product" "(0x0101|0x0201|0x0301|0x0303|0x0304|0x0305|0x0401)"; action "kldload -n uslcom"; }; @@ -3477,7 +3637,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x16d6"; - match "product" "(0x0001|0x0001)"; + match "product" "0x0001"; action "kldload -n uslcom"; }; @@ -3596,6 +3756,22 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1781"; + match "product" "0x0c30"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x17a8"; + match "product" "(0x0001|0x0005)"; + action "kldload -n uslcom"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x17f4"; match "product" "0xaaaa"; action "kldload -n uslcom"; @@ -3676,6 +3852,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1a79"; + match "product" "0x6001"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1a86"; match "product" "0x7523"; action "kldload -n uchcom"; @@ -3693,7 +3877,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x1b3d"; - match "product" "0x0153"; + match "product" "(0x0100|0x0101|0x0102|0x0103|0x0104|0x0105|0x0106|0x0107|0x0108|0x0109|0x010a|0x010b|0x010c|0x010d|0x010e|0x010f|0x0110|0x0111|0x0112|0x0113|0x0114|0x0115|0x0116|0x0117|0x0118|0x0119|0x011a|0x011b|0x011c|0x011d|0x011e|0x011f|0x0120|0x0121|0x0122|0x0123|0x0124|0x0125|0x0126|0x0128|0x0129|0x012a|0x012b|0x012d|0x012e|0x012f|0x0130|0x0131|0x0132|0x0133|0x0134|0x0135|0x0136|0x0137|0x0138|0x0139|0x013a|0x013b|0x013c|0x013d|0x013e|0x013f|0x0140|0x0141|0x0142|0x0143|0x0144|0x0145|0x0146|0x0147|0x0148|0x0149|0x014a|0x014b|0x014c|0x014d|0x014e|0x014f|0x0150|0x0151|0x0152|0x0153|0x0159|0x015a|0x015b|0x015c|0x015d|0x015e|0x015f|0x0160|0x0161|0x0162|0x0163|0x0164|0x0165|0x0166|0x0167|0x0168|0x0169|0x016a|0x016b|0x016c|0x016d|0x016e|0x016f|0x0170|0x0171|0x0172|0x0173|0x0174|0x0175|0x0176|0x0177|0x0178|0x0179|0x017a|0x017b|0x017c|0x017d|0x017e|0x017f|0x0180|0x0181|0x0182|0x0183|0x0184|0x0185|0x0186|0x0187|0x0188|0x0189|0x018a|0x018b|0x018c|0x018d|0x018e|0x018f|0x0190|0x0191|0x019 2|0x0193|0x0194|0x0195|0x0196|0x0197|0x0198|0x0199|0x019a|0x019b|0x019c|0x019d|0x019e|0x019f|0x01a0|0x01a1|0x01a2|0x01a3|0x01a4|0x01a5|0x01a6|0x01a7|0x01a8|0x01a9|0x01aa|0x01ab|0x01ac|0x01ad|0x01ae|0x01af|0x01b0|0x01b1|0x01b2|0x01b3|0x01b4|0x01b5|0x01b6|0x01b7|0x01b8|0x01b9|0x01ba|0x01bb|0x01bc|0x01bd|0x01be|0x01bf|0x01c0|0x01c1|0x01c2|0x01c3|0x01c4|0x01c5|0x01c6|0x01c7|0x01c8|0x01c9|0x01ca|0x01cb|0x01cc|0x01cd|0x01ce|0x01cf|0x01d0|0x01d1|0x01d2|0x01d3|0x01d4|0x01d5|0x01d6|0x01d7|0x01d8|0x01d9|0x01da|0x01db|0x01dc|0x01dd|0x01de|0x01df|0x01e0|0x01e1|0x01e2|0x01e3|0x01e4|0x01e5|0x01e6|0x01e7|0x01e8|0x01e9|0x01ea|0x01eb|0x01ec|0x01ed|0x01ee|0x01ef|0x01f0|0x01f1|0x01f2|0x01f3|0x01f4|0x01f5|0x01f6|0x01f7|0x01f8|0x01f9|0x01fa|0x01fb|0x01fc|0x01fd|0x01fe|0x01ff)"; action "kldload -n uftdi"; }; @@ -3716,6 +3900,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1b91"; + match "product" "0x0064"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1bbb"; match "product" "(0x0000|0xf000)"; action "kldload -n u3g"; @@ -3732,6 +3924,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1bc9"; + match "product" "0x6001"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1be3"; match "product" "0x07a6"; action "kldload -n uslcom"; @@ -3740,6 +3940,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1c0c"; + match "product" "0x0102"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1c9e"; match "product" "(0x6061|0x9603|0x9605|0xf000)"; action "kldload -n u3g"; @@ -3788,6 +3996,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x1e29"; + match "product" "(0x0102|0x0501)"; + action "kldload -n uslcom"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x1eda"; match "product" "0x2310"; action "kldload -n if_run"; @@ -3924,6 +4140,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x20b7"; + match "product" "0x0713"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x20b8"; match "product" "0x8888"; action "kldload -n if_run"; @@ -3940,6 +4164,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x2100"; + match "product" "(0x9e52|0x9e54)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x22b8"; match "product" "(0x4204|0x4214|0x4224|0x4234|0x4244)"; action "kldload -n uipaq"; @@ -3964,6 +4196,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x3195"; + match "product" "(0xf190|0xf280|0xf281)"; + action "kldload -n uslcom"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x3334"; match "product" "0x1701"; action "kldload -n if_aue"; @@ -4052,6 +4292,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x5050"; + match "product" "(0x0100|0x0101|0x0102|0x0103|0x0104|0x0105|0x0106|0x0107|0x0300|0x0301|0x0400|0x0500|0x0700|0x0800|0x0900|0x0a00|0x0b00|0x0c00|0x0d00|0x0e00|0x0f00|0x1000|0x8000|0x8001|0x8002|0x8003|0x8004|0x8005)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x5173"; match "product" "0x1809"; action "kldload -n if_zyd"; @@ -4204,6 +4452,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0xdeee"; + match "product" "(0x0300|0x0302|0x0303)"; + action "kldload -n uftdi"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "intclass" "0x02"; match "intsubclass" "0x02"; match "intprotocol" "0x01"; @@ -4344,5 +4600,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 1654 USB entries processed +# 2271 USB entries processed Modified: projects/fuse/include/gssapi/gssapi.h ============================================================================== --- projects/fuse/include/gssapi/gssapi.h Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/include/gssapi/gssapi.h Mon Aug 6 23:05:32 2012 (r239113) @@ -31,15 +31,13 @@ #ifndef _GSSAPI_GSSAPI_H_ #define _GSSAPI_GSSAPI_H_ -/* - * First, include stddef.h to get size_t defined. - */ -#include <stddef.h> +#include <sys/cdefs.h> +#include <sys/_types.h> -/* - * Include stdint.h to get explicitly sized data types. - */ -#include <stdint.h> +#ifndef _SIZE_T_DECLARED +typedef __size_t size_t; +#define _SIZE_T_DECLARED +#endif #ifndef _SSIZE_T_DECLARED typedef __ssize_t ssize_t; @@ -67,7 +65,7 @@ typedef struct _gss_name_t *gss_name_t; * unsigned integer supported by the platform that has at least * 32 bits of precision. */ -typedef uint32_t gss_uint32; +typedef __uint32_t gss_uint32; #ifdef OM_STRING @@ -89,7 +87,7 @@ typedef OM_object_identifier gss_OID_des */ typedef gss_uint32 OM_uint32; -typedef uint64_t OM_uint64; +typedef __uint64_t OM_uint64; typedef struct gss_OID_desc_struct { OM_uint32 length; Modified: projects/fuse/lib/libpam/modules/pam_krb5/pam_krb5.c ============================================================================== --- projects/fuse/lib/libpam/modules/pam_krb5/pam_krb5.c Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/lib/libpam/modules/pam_krb5/pam_krb5.c Mon Aug 6 23:05:32 2012 (r239113) @@ -91,6 +91,7 @@ static void compat_free_data_contents(kr #define PAM_OPT_NO_CCACHE "no_ccache" #define PAM_OPT_NO_USER_CHECK "no_user_check" #define PAM_OPT_REUSE_CCACHE "reuse_ccache" +#define PAM_OPT_NO_USER_CHECK "no_user_check" #define PAM_LOG_KRB5_ERR(ctx, rv, fmt, ...) \ do { \ @@ -218,10 +219,12 @@ pam_sm_authenticate(pam_handle_t *pamh, PAM_LOG("PAM_USER Redone"); } - pwd = getpwnam(user); - if (pwd == NULL) { - retval = PAM_USER_UNKNOWN; - goto cleanup2; + if (!openpam_get_option(pamh, PAM_OPT_NO_USER_CHECK)) { + pwd = getpwnam(user); + if (pwd == NULL) { + retval = PAM_USER_UNKNOWN; + goto cleanup2; + } } PAM_LOG("Done getpwnam()"); @@ -335,11 +338,11 @@ cleanup: PAM_LOG("Done cleanup"); cleanup2: krb5_free_principal(pam_context, princ); - PAM_LOG("Done cleanup2"); -cleanup3: if (princ_name) free(princ_name); + PAM_LOG("Done cleanup2"); +cleanup3: krb5_free_context(pam_context); PAM_LOG("Done cleanup3"); @@ -802,11 +805,11 @@ cleanup: PAM_LOG("Done cleanup"); cleanup2: krb5_free_principal(pam_context, princ); - PAM_LOG("Done cleanup2"); -cleanup3: if (princ_name) free(princ_name); + PAM_LOG("Done cleanup2"); +cleanup3: krb5_free_context(pam_context); PAM_LOG("Done cleanup3"); Modified: projects/fuse/lib/libpam/modules/pam_unix/pam_unix.c ============================================================================== --- projects/fuse/lib/libpam/modules/pam_unix/pam_unix.c Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/lib/libpam/modules/pam_unix/pam_unix.c Mon Aug 6 23:05:32 2012 (r239113) @@ -94,13 +94,13 @@ pam_sm_authenticate(pam_handle_t *pamh, const char *pass, *user, *realpw, *prompt; if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) { - pwd = getpwnam(getlogin()); + user = getlogin(); } else { retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS) return (retval); - pwd = getpwnam(user); } + pwd = getpwnam(user); PAM_LOG("Got user: %s", user); Modified: projects/fuse/libexec/rtld-elf/arm/rtld_start.S ============================================================================== --- projects/fuse/libexec/rtld-elf/arm/rtld_start.S Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/libexec/rtld-elf/arm/rtld_start.S Mon Aug 6 23:05:32 2012 (r239113) @@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$"); .globl .rtld_start .type .rtld_start,%function .rtld_start: + mov r6, sp /* save the stack pointer */ + bic sp, sp, #7 /* align the stack pointer */ sub sp, sp, #8 /* make room for obj_main & exit proc */ mov r4, r0 /* save ps_strings */ ldr sl, .L2 @@ -52,13 +54,13 @@ __FBSDID("$FreeBSD$"); bl _rtld_relocate_nonplt_self mov r1, sp add r2, sp, #4 - add r0, sp, #8 + mov r0, r6 /* load the sp the kernel gave us */ bl _rtld /* call the shared loader */ mov r3, r0 /* save entry point */ ldr r2, [sp, #0] /* r2 = cleanup */ ldr r1, [sp, #4] /* r1 = obj_main */ - add sp, sp, #8 /* restore stack */ + mov sp, r6 /* restore stack */ mov r0, r4 /* restore ps_strings */ mov pc, r3 /* jump to the entry point */ .L2: Modified: projects/fuse/libexec/rtld-elf/map_object.c ============================================================================== --- projects/fuse/libexec/rtld-elf/map_object.c Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/libexec/rtld-elf/map_object.c Mon Aug 6 23:05:32 2012 (r239113) @@ -153,7 +153,6 @@ map_object(int fd, const char *path, con break; note_start = (Elf_Addr)(char *)hdr + phdr->p_offset; note_end = note_start + phdr->p_filesz; - digest_notes(obj, note_start, note_end); break; } @@ -291,7 +290,8 @@ map_object(int fd, const char *path, con obj->stack_flags = stack_flags; obj->relro_page = obj->relocbase + trunc_page(relro_page); obj->relro_size = round_page(relro_size); - + if (note_start < note_end) + digest_notes(obj, note_start, note_end); munmap(hdr, PAGE_SIZE); return (obj); Modified: projects/fuse/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/fuse/sbin/camcontrol/camcontrol.c Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/sbin/camcontrol/camcontrol.c Mon Aug 6 23:05:32 2012 (r239113) @@ -4464,7 +4464,7 @@ static int smpcmd(struct cam_device *device, int argc, char **argv, char *combinedopt, int retry_count, int timeout) { - int c, error; + int c, error = 0; union ccb *ccb; uint8_t *smp_request = NULL, *smp_response = NULL; int request_size = 0, response_size = 0; Modified: projects/fuse/sbin/geom/class/virstor/gvirstor.8 ============================================================================== --- projects/fuse/sbin/geom/class/virstor/gvirstor.8 Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/sbin/geom/class/virstor/gvirstor.8 Mon Aug 6 23:05:32 2012 (r239113) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 24, 2011 +.Dd August 3, 2012 .Dt GVIRSTOR 8 .Os .Sh NAME @@ -43,6 +43,10 @@ .Op Fl fv .Ar name ... .Nm +.Cm destroy +.Op Fl fv +.Ar name ... +.Nm .Cm add .Op Fl vh .Ar name prov ... @@ -107,6 +111,9 @@ Turn off an existing virtual device with .Ar name . This command does not touch on-disk metadata. As with other GEOM classes, stopped geoms cannot be started manually. +.It Cm destroy +Same as +.Cm stop. .It Cm add Adds new components to existing virtual device with the given .Ar name . Modified: projects/fuse/sbin/ggate/shared/ggate.h ============================================================================== --- projects/fuse/sbin/ggate/shared/ggate.h Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/sbin/ggate/shared/ggate.h Mon Aug 6 23:05:32 2012 (r239113) @@ -95,8 +95,8 @@ struct g_gate_hdr { void g_gate_vlog(int priority, const char *message, va_list ap); void g_gate_log(int priority, const char *message, ...); -void g_gate_xvlog(const char *message, va_list ap); -void g_gate_xlog(const char *message, ...); +void g_gate_xvlog(const char *message, va_list ap) __dead2; +void g_gate_xlog(const char *message, ...) __dead2; off_t g_gate_mediasize(int fd); unsigned g_gate_sectorsize(int fd); void g_gate_open_device(void); Modified: projects/fuse/share/man/man4/hptiop.4 ============================================================================== --- projects/fuse/share/man/man4/hptiop.4 Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/share/man/man4/hptiop.4 Mon Aug 6 23:05:32 2012 (r239113) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 1, 2011 +.Dd August 5, 2012 .Dt HPTIOP 4 .Os .Sh NAME @@ -58,34 +58,46 @@ driver supports the following SAS and SA .Pp .Bl -bullet -compact .It -HighPoint RocketRAID 4320 +HighPoint RocketRAID 4322 .It HighPoint RocketRAID 4321 .It -HighPoint RocketRAID 4322 +HighPoint RocketRAID 4320 .It -HighPoint RocketRAID 3220 +HighPoint RocketRAID 4311 .It -HighPoint RocketRAID 3320 +HighPoint RocketRAID 4310 .It -HighPoint RocketRAID 3410 +HighPoint RocketRAID 4211 .It -HighPoint RocketRAID 3520 +HighPoint RocketRAID 4210 .It -HighPoint RocketRAID 3510 +HighPoint RocketRAID 3560 .It -HighPoint RocketRAID 3511 +HighPoint RocketRAID 3540 .It -HighPoint RocketRAID 3521 +HighPoint RocketRAID 3530 .It HighPoint RocketRAID 3522 .It -HighPoint RocketRAID 3540 +HighPoint RocketRAID 3521 .It -HighPoint RocketRAID 3120 +HighPoint RocketRAID 3520 +.It +HighPoint RocketRAID 3511 +.It +HighPoint RocketRAID 3510 +.It +HighPoint RocketRAID 3410 +.It +HighPoint RocketRAID 3320 +.It +HighPoint RocketRAID 3220 .It HighPoint RocketRAID 3122 .It +HighPoint RocketRAID 3120 +.It HighPoint RocketRAID 3020 .El .Sh NOTES Modified: projects/fuse/share/man/man4/polling.4 ============================================================================== --- projects/fuse/share/man/man4/polling.4 Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/share/man/man4/polling.4 Mon Aug 6 23:05:32 2012 (r239113) @@ -184,6 +184,7 @@ As of this writing, the .Xr fwe 4 , .Xr fwip 4 , .Xr fxp 4 , +.Xr igb 4 , .Xr ixgb 4 , .Xr nfe 4 , .Xr nge 4 , Modified: projects/fuse/share/man/man4/umodem.4 ============================================================================== --- projects/fuse/share/man/man4/umodem.4 Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/share/man/man4/umodem.4 Mon Aug 6 23:05:32 2012 (r239113) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 20, 2011 +.Dd August 6, 2012 .Dt UMODEM 4 .Os .Sh NAME @@ -92,6 +92,8 @@ Yamaha Broadband Wireless Router RTW65b ELSA MicroLink 56k USB modem .It Sony Ericsson W810i phone +.It +Sonim XP5300 Force .El .Sh SEE ALSO .Xr tty 4 , Modified: projects/fuse/share/man/man4/uslcom.4 ============================================================================== --- projects/fuse/share/man/man4/uslcom.4 Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/share/man/man4/uslcom.4 Mon Aug 6 23:05:32 2012 (r239113) @@ -16,12 +16,12 @@ .\" .\" $FreeBSD$ .\" -.Dd July 26, 2012 +.Dd August 4, 2012 .Dt USLCOM 4 .Os .Sh NAME .Nm uslcom -.Nd Silicon Laboratories CP2101/CP2102/CP2103/CP2104 based USB serial adapter +.Nd Silicon Laboratories CP2101/CP2102/CP2103/CP2104/CP2105 based USB serial adapter .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -41,7 +41,7 @@ uslcom_load="YES" .Sh DESCRIPTION The .Nm -driver supports Silicon Laboratories CP2101/CP2102/CP2103/CP2104 +driver supports Silicon Laboratories CP2101/CP2102/CP2103/CP2104/CP2105 based USB serial adapters. .Sh HARDWARE The following devices should work with the @@ -155,7 +155,7 @@ Renesas RX-Stick for RX610 .It Siemens MC60 Cable .It -Silicon Laboratories generic CP2101/CP2102/CP2103/CP2104 chips +Silicon Laboratories generic CP2101/CP2102/CP2103/CP2104/CP2105 chips .It Software Bisque Paramount ME .It @@ -210,6 +210,3 @@ The .Nm driver was written by .An Jonathan Gray Aq jsg@openbsd.org . -.Sh CAVEATS -On devices with multiple ports attached to a single chip, -only the first port is currently supported. Modified: projects/fuse/share/man/man5/rc.conf.5 ============================================================================== --- projects/fuse/share/man/man5/rc.conf.5 Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/share/man/man5/rc.conf.5 Mon Aug 6 23:05:32 2012 (r239113) @@ -1201,7 +1201,7 @@ on with the vlan tag 101 and the optional the IPv4 address 192.0.2.1/24: .Bd -literal vlans_em0="101" -ifconfig_em0_101="inet 192.0.2.1/24" +ipv4_addrs_em0_101="192.0.2.1/24" .Ed .Pp To create a vlan device named Modified: projects/fuse/sys/amd64/amd64/pmap.c ============================================================================== --- projects/fuse/sys/amd64/amd64/pmap.c Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/sys/amd64/amd64/pmap.c Mon Aug 6 23:05:32 2012 (r239113) @@ -3468,7 +3468,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, newpte |= PG_G; newpte |= pmap_cache_bits(m->md.pat_mode, 0); - mpte = om = NULL; + mpte = NULL; lock = NULL; rw_rlock(&pvh_global_lock); @@ -3540,12 +3540,6 @@ retry: if (((origpte ^ newpte) & ~(PG_M | PG_A)) == 0) goto unchanged; goto validate; - } else { - /* - * Yes, fall through to validate the new mapping. - */ - if ((origpte & PG_MANAGED) != 0) - om = PHYS_TO_VM_PAGE(opa); } } else { /* @@ -3578,6 +3572,7 @@ validate: opa = origpte & PG_FRAME; if (opa != pa) { if ((origpte & PG_MANAGED) != 0) { + om = PHYS_TO_VM_PAGE(opa); if ((origpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(om); Modified: projects/fuse/sys/arm/arm/bcopyinout.S ============================================================================== --- projects/fuse/sys/arm/arm/bcopyinout.S Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/sys/arm/arm/bcopyinout.S Mon Aug 6 23:05:32 2012 (r239113) @@ -39,6 +39,7 @@ #include "assym.s" #include <machine/asm.h> +#include <sys/errno.h> .L_arm_memcpy: .word _C_LABEL(_arm_memcpy) @@ -310,7 +311,7 @@ ENTRY(copyin) RET .Lcopyfault: - mov r0, #14 /* EFAULT */ + ldr r0, =EFAULT str r5, [r4, #PCB_ONFAULT] RESTORE_REGS Modified: projects/fuse/sys/arm/arm/bcopyinout_xscale.S ============================================================================== --- projects/fuse/sys/arm/arm/bcopyinout_xscale.S Mon Aug 6 22:58:46 2012 (r239112) +++ projects/fuse/sys/arm/arm/bcopyinout_xscale.S Mon Aug 6 23:05:32 2012 (r239113) @@ -108,6 +108,7 @@ ENTRY(copyin) ldmfd sp!, {r10-r11, pc} .Lcopyin_fault: + ldr r0, =EFAULT str r11, [r10, #PCB_ONFAULT] cmp r3, #0x00 ldmgtfd sp!, {r4-r7} /* r3 > 0 Restore r4-r7 */ @@ -559,6 +560,7 @@ ENTRY(copyout) ldmfd sp!, {r10-r11, pc} .Lcopyout_fault: + ldr r0, =EFAULT str r11, [r10, #PCB_ONFAULT] cmp r3, #0x00 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208062305.q76N5WFN093122>