Date: Mon, 5 Mar 2012 17:51:16 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232555 - in projects/multi-fibv6/9: . cddl/contrib/opensolaris/cmd/zfs contrib/top etc lib/libc/gen lib/libc/include lib/libc/sys release sbin/ifconfig sbin/ipfw sbin/mount_ntfs share/... Message-ID: <201203051751.q25HpGMq097037@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Mon Mar 5 17:51:15 2012 New Revision: 232555 URL: http://svn.freebsd.org/changeset/base/232555 Log: IF stable/9 --record-only r232292. IF stable/9 @r232554 Sponsored by: Cisco Systems, Inc. Added: projects/multi-fibv6/9/lib/libc/gen/dl_iterate_phdr.3 - copied unchanged from r232554, stable/9/lib/libc/gen/dl_iterate_phdr.3 Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/multi-fibv6/9/contrib/top/top.c projects/multi-fibv6/9/etc/rc.subr projects/multi-fibv6/9/lib/libc/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/gen/aux.c projects/multi-fibv6/9/lib/libc/gen/dlfcn.c projects/multi-fibv6/9/lib/libc/gen/getutxent.c projects/multi-fibv6/9/lib/libc/include/libc_private.h projects/multi-fibv6/9/lib/libc/sys/kqueue.2 projects/multi-fibv6/9/release/rc.local projects/multi-fibv6/9/sbin/ifconfig/ifcarp.c projects/multi-fibv6/9/sbin/ifconfig/ifconfig.8 projects/multi-fibv6/9/sbin/ipfw/ipfw.8 projects/multi-fibv6/9/sbin/mount_ntfs/mount_ntfs.c projects/multi-fibv6/9/share/man/man9/devtoname.9 projects/multi-fibv6/9/sys/arm/arm/irq_dispatch.S projects/multi-fibv6/9/sys/arm/arm/pmap.c projects/multi-fibv6/9/sys/arm/include/pmap.h projects/multi-fibv6/9/sys/boot/i386/libi386/vidconsole.c projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/Makefile projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/boot1.c projects/multi-fibv6/9/sys/cam/ctl/ctl_private.h projects/multi-fibv6/9/sys/compat/freebsd32/freebsd32_signal.h projects/multi-fibv6/9/sys/compat/linux/linux_misc.c projects/multi-fibv6/9/sys/compat/linux/linux_stats.c projects/multi-fibv6/9/sys/compat/linux/linux_util.c projects/multi-fibv6/9/sys/compat/linux/linux_util.h projects/multi-fibv6/9/sys/compat/svr4/imgact_svr4.c projects/multi-fibv6/9/sys/conf/kern.mk projects/multi-fibv6/9/sys/dev/acpica/acpi_thermal.c projects/multi-fibv6/9/sys/dev/isci/isci.c projects/multi-fibv6/9/sys/dev/iscsi/initiator/isc_sm.c projects/multi-fibv6/9/sys/dev/mvs/mvs.h projects/multi-fibv6/9/sys/dev/mvs/mvs_soc.c projects/multi-fibv6/9/sys/dev/sound/pcm/mixer.c projects/multi-fibv6/9/sys/dev/usb/usb_dev.c projects/multi-fibv6/9/sys/dev/xen/blkback/blkback.c projects/multi-fibv6/9/sys/fs/msdosfs/msdosfs_denode.c projects/multi-fibv6/9/sys/fs/msdosfs/msdosfs_lookup.c projects/multi-fibv6/9/sys/fs/msdosfs/msdosfs_vnops.c projects/multi-fibv6/9/sys/geom/part/g_part.c projects/multi-fibv6/9/sys/geom/part/g_part_ebr.c projects/multi-fibv6/9/sys/geom/part/g_part_mbr.c projects/multi-fibv6/9/sys/i386/ibcs2/imgact_coff.c projects/multi-fibv6/9/sys/i386/linux/imgact_linux.c projects/multi-fibv6/9/sys/i386/linux/linux_sysvec.c projects/multi-fibv6/9/sys/kern/imgact_gzip.c projects/multi-fibv6/9/sys/kern/vfs_aio.c projects/multi-fibv6/9/sys/modules/hpt27xx/Makefile projects/multi-fibv6/9/sys/modules/scc/Makefile projects/multi-fibv6/9/sys/netgraph/ng_device.c projects/multi-fibv6/9/sys/powerpc/aim/machdep.c projects/multi-fibv6/9/sys/powerpc/aim/slb.c projects/multi-fibv6/9/sys/powerpc/aim/trap.c projects/multi-fibv6/9/sys/powerpc/aim/trap_subr64.S projects/multi-fibv6/9/sys/powerpc/include/pcpu.h projects/multi-fibv6/9/sys/powerpc/ofw/ofw_pcib_pci.c projects/multi-fibv6/9/sys/powerpc/ofw/ofw_syscons.c projects/multi-fibv6/9/sys/powerpc/powermac/smusat.c projects/multi-fibv6/9/sys/powerpc/powerpc/genassym.c projects/multi-fibv6/9/sys/powerpc/ps3/platform_ps3.c projects/multi-fibv6/9/sys/powerpc/ps3/ps3_syscons.c projects/multi-fibv6/9/sys/security/mac_biba/mac_biba.c projects/multi-fibv6/9/sys/security/mac_lomac/mac_lomac.c projects/multi-fibv6/9/sys/security/mac_mls/mac_mls.c projects/multi-fibv6/9/sys/sys/signal.h projects/multi-fibv6/9/sys/ufs/ufs/ufs_quota.c projects/multi-fibv6/9/sys/vm/swap_pager.c projects/multi-fibv6/9/sys/x86/x86/busdma_machdep.c projects/multi-fibv6/9/usr.sbin/bsdinstall/distextract/distextract.c projects/multi-fibv6/9/usr.sbin/bsdinstall/distfetch/distfetch.c projects/multi-fibv6/9/usr.sbin/cron/crontab/crontab.c projects/multi-fibv6/9/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh projects/multi-fibv6/9/usr.sbin/pc-sysinstall/backend/functions-disk.sh projects/multi-fibv6/9/usr.sbin/pc-sysinstall/backend/parseconfig.sh projects/multi-fibv6/9/usr.sbin/pkg_install/add/main.c projects/multi-fibv6/9/usr.sbin/vipw/vipw.8 Directory Properties: projects/multi-fibv6/9/ (props changed) projects/multi-fibv6/9/MAINTAINERS (props changed) projects/multi-fibv6/9/Makefile (props changed) projects/multi-fibv6/9/Makefile.inc1 (props changed) projects/multi-fibv6/9/UPDATING (props changed) projects/multi-fibv6/9/bin/df/ (props changed) projects/multi-fibv6/9/bin/ed/ (props changed) projects/multi-fibv6/9/bin/ps/ (props changed) projects/multi-fibv6/9/bin/sh/ (props changed) projects/multi-fibv6/9/cddl/ (props changed) projects/multi-fibv6/9/cddl/contrib/opensolaris/ (props changed) projects/multi-fibv6/9/cddl/lib/ (props changed) projects/multi-fibv6/9/cddl/lib/drti/ (props changed) projects/multi-fibv6/9/contrib/bind9/ (props changed) projects/multi-fibv6/9/contrib/binutils/ (props changed) projects/multi-fibv6/9/contrib/bsnmp/ (props changed) projects/multi-fibv6/9/contrib/bzip2/ (props changed) projects/multi-fibv6/9/contrib/compiler-rt/ (props changed) projects/multi-fibv6/9/contrib/dialog/ (props changed) projects/multi-fibv6/9/contrib/ee/ (props changed) projects/multi-fibv6/9/contrib/expat/ (props changed) projects/multi-fibv6/9/contrib/file/ (props changed) projects/multi-fibv6/9/contrib/gcc/ (props changed) projects/multi-fibv6/9/contrib/gcclibs/ (props changed) projects/multi-fibv6/9/contrib/gdb/ (props changed) projects/multi-fibv6/9/contrib/gdtoa/ (props changed) projects/multi-fibv6/9/contrib/gnu-sort/ (props changed) projects/multi-fibv6/9/contrib/gperf/ (props changed) projects/multi-fibv6/9/contrib/groff/ (props changed) projects/multi-fibv6/9/contrib/less/ (props changed) projects/multi-fibv6/9/contrib/libarchive/ (props changed) projects/multi-fibv6/9/contrib/libarchive/cpio/ (props changed) projects/multi-fibv6/9/contrib/libarchive/libarchive/ (props changed) projects/multi-fibv6/9/contrib/libarchive/libarchive_fe/ (props changed) projects/multi-fibv6/9/contrib/libarchive/tar/ (props changed) projects/multi-fibv6/9/contrib/libpcap/ (props changed) projects/multi-fibv6/9/contrib/libstdc++/ (props changed) projects/multi-fibv6/9/contrib/llvm/ (props changed) projects/multi-fibv6/9/contrib/llvm/tools/clang/ (props changed) projects/multi-fibv6/9/contrib/ncurses/ (props changed) projects/multi-fibv6/9/contrib/netcat/ (props changed) projects/multi-fibv6/9/contrib/ntp/ (props changed) projects/multi-fibv6/9/contrib/one-true-awk/ (props changed) projects/multi-fibv6/9/contrib/openbsm/ (props changed) projects/multi-fibv6/9/contrib/openpam/ (props changed) projects/multi-fibv6/9/contrib/openresolv/ (props changed) projects/multi-fibv6/9/contrib/pf/ (props changed) projects/multi-fibv6/9/contrib/pnpinfo/ (props changed) projects/multi-fibv6/9/contrib/sendmail/ (props changed) projects/multi-fibv6/9/contrib/tcpdump/ (props changed) projects/multi-fibv6/9/contrib/tcsh/ (props changed) projects/multi-fibv6/9/contrib/telnet/ (props changed) projects/multi-fibv6/9/contrib/tnftp/ (props changed) projects/multi-fibv6/9/contrib/top/ (props changed) projects/multi-fibv6/9/contrib/top/install-sh (props changed) projects/multi-fibv6/9/contrib/tzcode/ (props changed) projects/multi-fibv6/9/contrib/tzcode/stdtime/ (props changed) projects/multi-fibv6/9/contrib/tzcode/zic/ (props changed) projects/multi-fibv6/9/contrib/tzdata/ (props changed) projects/multi-fibv6/9/contrib/wpa/ (props changed) projects/multi-fibv6/9/contrib/xz/ (props changed) projects/multi-fibv6/9/crypto/openssh/ (props changed) projects/multi-fibv6/9/crypto/openssl/ (props changed) projects/multi-fibv6/9/etc/ (props changed) projects/multi-fibv6/9/games/factor/ (props changed) projects/multi-fibv6/9/games/fortune/ (props changed) projects/multi-fibv6/9/gnu/lib/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/binutils/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/binutils/libbinutils/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/cc/cc_tools/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/gdb/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/gdb/kgdb/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/gperf/ (props changed) projects/multi-fibv6/9/include/ (props changed) projects/multi-fibv6/9/kerberos5/ (props changed) projects/multi-fibv6/9/lib/ (props changed) projects/multi-fibv6/9/lib/clang/ (props changed) projects/multi-fibv6/9/lib/libarchive/ (props changed) projects/multi-fibv6/9/lib/libc/ (props changed) projects/multi-fibv6/9/lib/libc/stdtime/ (props changed) projects/multi-fibv6/9/lib/libc/sys/ (props changed) projects/multi-fibv6/9/lib/libelf/ (props changed) projects/multi-fibv6/9/lib/libfetch/ (props changed) projects/multi-fibv6/9/lib/libipsec/ (props changed) projects/multi-fibv6/9/lib/libkvm/ (props changed) projects/multi-fibv6/9/lib/libopie/ (props changed) projects/multi-fibv6/9/lib/libpam/ (props changed) projects/multi-fibv6/9/lib/libpmc/ (props changed) projects/multi-fibv6/9/lib/librpcsvc/ (props changed) projects/multi-fibv6/9/lib/librt/ (props changed) projects/multi-fibv6/9/lib/libsm/ (props changed) projects/multi-fibv6/9/lib/libthr/ (props changed) projects/multi-fibv6/9/lib/libthread_db/ (props changed) projects/multi-fibv6/9/lib/libusb/ (props changed) projects/multi-fibv6/9/lib/libusbhid/ (props changed) projects/multi-fibv6/9/lib/libutil/ (props changed) projects/multi-fibv6/9/lib/libvgl/ (props changed) projects/multi-fibv6/9/lib/libypclnt/ (props changed) projects/multi-fibv6/9/lib/libz/ (props changed) projects/multi-fibv6/9/lib/msun/ (props changed) projects/multi-fibv6/9/libexec/bootpd/ (props changed) projects/multi-fibv6/9/libexec/getty/ (props changed) projects/multi-fibv6/9/libexec/mail.local/ (props changed) projects/multi-fibv6/9/libexec/pppoed/ (props changed) projects/multi-fibv6/9/libexec/rbootd/ (props changed) projects/multi-fibv6/9/libexec/rshd/ (props changed) projects/multi-fibv6/9/libexec/rtld-elf/ (props changed) projects/multi-fibv6/9/libexec/smrsh/ (props changed) projects/multi-fibv6/9/libexec/tftpd/ (props changed) projects/multi-fibv6/9/libexec/ypxfr/ (props changed) projects/multi-fibv6/9/release/ (props changed) projects/multi-fibv6/9/release/doc/en_US.ISO8859-1/hardware/ (props changed) projects/multi-fibv6/9/release/picobsd/tinyware/passwd/ (props changed) projects/multi-fibv6/9/rescue/rescue/ (props changed) projects/multi-fibv6/9/sbin/ (props changed) projects/multi-fibv6/9/sbin/atacontrol/ (props changed) projects/multi-fibv6/9/sbin/atm/atmconfig/ (props changed) projects/multi-fibv6/9/sbin/bsdlabel/ (props changed) projects/multi-fibv6/9/sbin/camcontrol/ (props changed) projects/multi-fibv6/9/sbin/devd/ (props changed) projects/multi-fibv6/9/sbin/dhclient/ (props changed) projects/multi-fibv6/9/sbin/dump/ (props changed) projects/multi-fibv6/9/sbin/dumpfs/ (props changed) projects/multi-fibv6/9/sbin/fdisk/ (props changed) projects/multi-fibv6/9/sbin/fdisk_pc98/ (props changed) projects/multi-fibv6/9/sbin/fsck_ffs/ (props changed) projects/multi-fibv6/9/sbin/fsdb/ (props changed) projects/multi-fibv6/9/sbin/fsirand/ (props changed) projects/multi-fibv6/9/sbin/gbde/ (props changed) projects/multi-fibv6/9/sbin/geom/ (props changed) projects/multi-fibv6/9/sbin/geom/class/part/ (props changed) projects/multi-fibv6/9/sbin/gvinum/ (props changed) projects/multi-fibv6/9/sbin/hastctl/ (props changed) projects/multi-fibv6/9/sbin/hastd/ (props changed) projects/multi-fibv6/9/sbin/ifconfig/ (props changed) projects/multi-fibv6/9/sbin/init/ (props changed) projects/multi-fibv6/9/sbin/ipf/ (props changed) projects/multi-fibv6/9/sbin/ipfw/ (props changed) projects/multi-fibv6/9/sbin/md5/ (props changed) projects/multi-fibv6/9/sbin/mount/ (props changed) projects/multi-fibv6/9/sbin/mount_nfs/ (props changed) projects/multi-fibv6/9/sbin/mount_ntfs/ (props changed) projects/multi-fibv6/9/sbin/newfs/ (props changed) projects/multi-fibv6/9/sbin/newfs_msdos/ (props changed) projects/multi-fibv6/9/sbin/ping6/ (props changed) projects/multi-fibv6/9/sbin/route/ (props changed) projects/multi-fibv6/9/sbin/routed/rtquery/ (props changed) projects/multi-fibv6/9/sbin/sysctl/ (props changed) projects/multi-fibv6/9/sbin/tunefs/ (props changed) projects/multi-fibv6/9/secure/lib/libcrypto/ (props changed) projects/multi-fibv6/9/share/doc/ (props changed) projects/multi-fibv6/9/share/examples/ (props changed) projects/multi-fibv6/9/share/examples/diskless/ (props changed) projects/multi-fibv6/9/share/examples/ppp/ (props changed) projects/multi-fibv6/9/share/examples/printing/ (props changed) projects/multi-fibv6/9/share/man/ (props changed) projects/multi-fibv6/9/share/man/man4/ (props changed) projects/multi-fibv6/9/share/man/man5/ (props changed) projects/multi-fibv6/9/share/man/man7/ (props changed) projects/multi-fibv6/9/share/man/man9/ (props changed) projects/multi-fibv6/9/share/misc/ (props changed) projects/multi-fibv6/9/share/mk/ (props changed) projects/multi-fibv6/9/share/mk/bsd.arch.inc.mk (props changed) projects/multi-fibv6/9/share/zoneinfo/ (props changed) projects/multi-fibv6/9/sys/ (props changed) projects/multi-fibv6/9/sys/amd64/include/xen/ (props changed) projects/multi-fibv6/9/sys/boot/ (props changed) projects/multi-fibv6/9/sys/boot/i386/efi/ (props changed) projects/multi-fibv6/9/sys/boot/ia64/efi/ (props changed) projects/multi-fibv6/9/sys/boot/ia64/ski/ (props changed) projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/ (props changed) projects/multi-fibv6/9/sys/boot/powerpc/ofw/ (props changed) projects/multi-fibv6/9/sys/cddl/contrib/opensolaris/ (props changed) projects/multi-fibv6/9/sys/conf/ (props changed) projects/multi-fibv6/9/sys/contrib/dev/acpica/ (props changed) projects/multi-fibv6/9/sys/contrib/octeon-sdk/ (props changed) projects/multi-fibv6/9/sys/contrib/pf/ (props changed) projects/multi-fibv6/9/sys/contrib/x86emu/ (props changed) projects/multi-fibv6/9/sys/i386/conf/XENHVM (props changed) projects/multi-fibv6/9/tools/ (props changed) projects/multi-fibv6/9/tools/build/options/ (props changed) projects/multi-fibv6/9/tools/regression/bin/sh/ (props changed) projects/multi-fibv6/9/tools/regression/bin/test/ (props changed) projects/multi-fibv6/9/tools/regression/doat/ (props changed) projects/multi-fibv6/9/tools/regression/fifo/ (props changed) projects/multi-fibv6/9/tools/regression/pipe/ (props changed) projects/multi-fibv6/9/tools/test/ (props changed) projects/multi-fibv6/9/tools/tools/ (props changed) projects/multi-fibv6/9/tools/tools/nanobsd/ (props changed) projects/multi-fibv6/9/tools/tools/zfsboottest/ (props changed) projects/multi-fibv6/9/usr.bin/ (props changed) projects/multi-fibv6/9/usr.bin/ar/ (props changed) projects/multi-fibv6/9/usr.bin/brandelf/ (props changed) projects/multi-fibv6/9/usr.bin/bsdiff/ (props changed) projects/multi-fibv6/9/usr.bin/calendar/ (props changed) projects/multi-fibv6/9/usr.bin/clang/ (props changed) projects/multi-fibv6/9/usr.bin/compress/ (props changed) projects/multi-fibv6/9/usr.bin/cpio/ (props changed) projects/multi-fibv6/9/usr.bin/csup/ (props changed) projects/multi-fibv6/9/usr.bin/ctlstat/ (props changed) projects/multi-fibv6/9/usr.bin/du/ (props changed) projects/multi-fibv6/9/usr.bin/fetch/ (props changed) projects/multi-fibv6/9/usr.bin/gprof/ (props changed) projects/multi-fibv6/9/usr.bin/grep/ (props changed) projects/multi-fibv6/9/usr.bin/hexdump/ (props changed) projects/multi-fibv6/9/usr.bin/indent/ (props changed) projects/multi-fibv6/9/usr.bin/ktrace/ (props changed) projects/multi-fibv6/9/usr.bin/limits/ (props changed) projects/multi-fibv6/9/usr.bin/mail/ (props changed) projects/multi-fibv6/9/usr.bin/make/ (props changed) projects/multi-fibv6/9/usr.bin/mkesdb/ (props changed) projects/multi-fibv6/9/usr.bin/mt/ (props changed) projects/multi-fibv6/9/usr.bin/ncplist/ (props changed) projects/multi-fibv6/9/usr.bin/netstat/ (props changed) projects/multi-fibv6/9/usr.bin/newgrp/ (props changed) projects/multi-fibv6/9/usr.bin/printf/ (props changed) projects/multi-fibv6/9/usr.bin/procstat/ (props changed) projects/multi-fibv6/9/usr.bin/rctl/ (props changed) projects/multi-fibv6/9/usr.bin/rpcgen/ (props changed) projects/multi-fibv6/9/usr.bin/rwho/ (props changed) projects/multi-fibv6/9/usr.bin/script/ (props changed) projects/multi-fibv6/9/usr.bin/sed/ (props changed) projects/multi-fibv6/9/usr.bin/sockstat/ (props changed) projects/multi-fibv6/9/usr.bin/split/ (props changed) projects/multi-fibv6/9/usr.bin/systat/ (props changed) projects/multi-fibv6/9/usr.bin/tar/ (props changed) projects/multi-fibv6/9/usr.bin/truss/ (props changed) projects/multi-fibv6/9/usr.bin/usbhidaction/ (props changed) projects/multi-fibv6/9/usr.bin/usbhidctl/ (props changed) projects/multi-fibv6/9/usr.bin/vacation/ (props changed) projects/multi-fibv6/9/usr.bin/vmstat/ (props changed) projects/multi-fibv6/9/usr.bin/xlint/ (props changed) projects/multi-fibv6/9/usr.sbin/amd/ (props changed) projects/multi-fibv6/9/usr.sbin/bluetooth/sdpd/ (props changed) projects/multi-fibv6/9/usr.sbin/boot0cfg/ (props changed) projects/multi-fibv6/9/usr.sbin/bootparamd/ (props changed) projects/multi-fibv6/9/usr.sbin/bsdinstall/ (props changed) projects/multi-fibv6/9/usr.sbin/bsdinstall/scripts/ (props changed) projects/multi-fibv6/9/usr.sbin/bsnmpd/ (props changed) projects/multi-fibv6/9/usr.sbin/bsnmpd/modules/snmp_wlan/ (props changed) projects/multi-fibv6/9/usr.sbin/burncd/ (props changed) projects/multi-fibv6/9/usr.sbin/cpucontrol/ (props changed) projects/multi-fibv6/9/usr.sbin/cron/ (props changed) projects/multi-fibv6/9/usr.sbin/cron/crontab/ (props changed) projects/multi-fibv6/9/usr.sbin/ctm/ctm_dequeue/ (props changed) projects/multi-fibv6/9/usr.sbin/freebsd-update/ (props changed) projects/multi-fibv6/9/usr.sbin/fwcontrol/ (props changed) projects/multi-fibv6/9/usr.sbin/gssd/ (props changed) projects/multi-fibv6/9/usr.sbin/i2c/ (props changed) projects/multi-fibv6/9/usr.sbin/iostat/ (props changed) projects/multi-fibv6/9/usr.sbin/jail/ (props changed) projects/multi-fibv6/9/usr.sbin/kbdmap/ (props changed) projects/multi-fibv6/9/usr.sbin/keyserv/ (props changed) projects/multi-fibv6/9/usr.sbin/lpr/filters/ (props changed) projects/multi-fibv6/9/usr.sbin/lpr/lpd/ (props changed) projects/multi-fibv6/9/usr.sbin/makefs/ (props changed) projects/multi-fibv6/9/usr.sbin/mergemaster/ (props changed) projects/multi-fibv6/9/usr.sbin/mfiutil/ (props changed) projects/multi-fibv6/9/usr.sbin/mixer/ (props changed) projects/multi-fibv6/9/usr.sbin/mtree/ (props changed) projects/multi-fibv6/9/usr.sbin/ndiscvt/ (props changed) projects/multi-fibv6/9/usr.sbin/newsyslog/ (props changed) projects/multi-fibv6/9/usr.sbin/pc-sysinstall/ (props changed) projects/multi-fibv6/9/usr.sbin/pkg_install/ (props changed) projects/multi-fibv6/9/usr.sbin/pkg_install/add/ (props changed) projects/multi-fibv6/9/usr.sbin/pkg_install/info/ (props changed) projects/multi-fibv6/9/usr.sbin/pkg_install/updating/ (props changed) projects/multi-fibv6/9/usr.sbin/pmccontrol/ (props changed) projects/multi-fibv6/9/usr.sbin/pmcstat/ (props changed) projects/multi-fibv6/9/usr.sbin/portsnap/ (props changed) projects/multi-fibv6/9/usr.sbin/pw/ (props changed) projects/multi-fibv6/9/usr.sbin/route6d/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.lockd/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.statd/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.yppasswdd/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.ypupdated/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.ypxfrd/ (props changed) projects/multi-fibv6/9/usr.sbin/rtadvctl/ (props changed) projects/multi-fibv6/9/usr.sbin/rtadvd/ (props changed) projects/multi-fibv6/9/usr.sbin/rtsold/ (props changed) projects/multi-fibv6/9/usr.sbin/sa/ (props changed) projects/multi-fibv6/9/usr.sbin/sade/ (props changed) projects/multi-fibv6/9/usr.sbin/sendmail/ (props changed) projects/multi-fibv6/9/usr.sbin/timed/ (props changed) projects/multi-fibv6/9/usr.sbin/tzsetup/ (props changed) projects/multi-fibv6/9/usr.sbin/uhsoctl/ (props changed) projects/multi-fibv6/9/usr.sbin/usbdump/ (props changed) projects/multi-fibv6/9/usr.sbin/vipw/ (props changed) projects/multi-fibv6/9/usr.sbin/wpa/wpa_supplicant/ (props changed) projects/multi-fibv6/9/usr.sbin/yp_mkdb/ (props changed) projects/multi-fibv6/9/usr.sbin/yppush/ (props changed) projects/multi-fibv6/9/usr.sbin/ypserv/ (props changed) projects/multi-fibv6/9/usr.sbin/zic/ (props changed) Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Mar 5 17:51:15 2012 (r232555) @@ -1,5 +1,5 @@ '\" te -.\" Copyright (c) 2011, Martin Matuska <mm@FreeBSD.org>. +.\" Copyright (c) 2012, Martin Matuska <mm@FreeBSD.org>. .\" All Rights Reserved. .\" .\" The contents of this file are subject to the terms of the @@ -18,8 +18,8 @@ .\" information: Portions Copyright [yyyy] [name of copyright owner] .\" .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. -.\" Copyright 2011 Nexenta Systems, Inc. All rights reserved. .\" Copyright (c) 2011 by Delphix. All rights reserved. +.\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd@FreeBSD.org> .\" .\" $FreeBSD$ @@ -113,6 +113,7 @@ .Op Fl r Ns | Ns Fl d Ar depth .Op Fl Hp .Op Fl o Ar all | field Ns Op , Ns Ar ... +.Op Fl t Ar type Ns Op , Ns Ar ... .Op Fl s Ar source Ns Op , Ns Ar ... .Ar all | property Ns Op , Ns Ar ... .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot @@ -1753,7 +1754,7 @@ A comma-separated list of types to displ is one of .Sy filesystem , snapshot , volume , No or Sy all . For example, specifying -.Fl o Cm snapshot +.Fl t Cm snapshot displays only snapshots. .It Fl s Ar property A property for sorting the output by column in ascending order based on the @@ -1811,6 +1812,7 @@ section. .Op Fl r Ns | Ns Fl d Ar depth .Op Fl Hp .Op Fl o Ar all | field Ns Op , Ns Ar ... +.Op Fl t Ar type Ns Op , Ns Ar ... .Op Fl s Ar source Ns Op , Ns Ar ... .Ar all | property Ns Op , Ns Ar ... .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot @@ -1871,6 +1873,14 @@ Default values are The keyword .Cm all specifies all columns. +.It Fl t Ar type Ns Op , Ns Ar ... +A comma-separated list of types to display, where +.Ar type +is one of +.Sy filesystem , snapshot , volume , No or Sy all . +For example, specifying +.Fl t Cm snapshot +displays only snapshots. .It Fl s Ar source Ns Op , Ns Ar ... A comma-separated list of sources to display. Those properties coming from a source other than those in this list are ignored. Each source must be one of Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Mar 5 17:51:15 2012 (r232555) @@ -227,7 +227,8 @@ get_usage(zfs_help_t idx) "<snapshot>[%<snapname>][,...]\n")); case HELP_GET: return (gettext("\tget [-rHp] [-d max] " - "[-o \"all\" | field[,...]] [-s source[,...]]\n" + "[-o \"all\" | field[,...]] [-t type[,...]] " + "[-s source[,...]]\n" "\t <\"all\" | property[,...]> " "[filesystem|volume|snapshot] ...\n")); case HELP_INHERIT: @@ -1473,6 +1474,7 @@ zfs_do_get(int argc, char **argv) { zprop_get_cbdata_t cb = { 0 }; int i, c, flags = ZFS_ITER_ARGS_CAN_BE_PATHS; + int types = ZFS_TYPE_DATASET; char *value, *fields; int ret = 0; int limit = 0; @@ -1489,7 +1491,7 @@ zfs_do_get(int argc, char **argv) cb.cb_type = ZFS_TYPE_DATASET; /* check options */ - while ((c = getopt(argc, argv, ":d:o:s:rHp")) != -1) { + while ((c = getopt(argc, argv, ":d:o:s:rt:Hp")) != -1) { switch (c) { case 'p': cb.cb_literal = B_TRUE; @@ -1607,6 +1609,37 @@ zfs_do_get(int argc, char **argv) } break; + case 't': + types = 0; + flags &= ~ZFS_ITER_PROP_LISTSNAPS; + while (*optarg != '\0') { + static char *type_subopts[] = { "filesystem", + "volume", "snapshot", "all", NULL }; + + switch (getsubopt(&optarg, type_subopts, + &value)) { + case 0: + types |= ZFS_TYPE_FILESYSTEM; + break; + case 1: + types |= ZFS_TYPE_VOLUME; + break; + case 2: + types |= ZFS_TYPE_SNAPSHOT; + break; + case 3: + types = ZFS_TYPE_DATASET; + break; + + default: + (void) fprintf(stderr, + gettext("invalid type '%s'\n"), + value); + usage(B_FALSE); + } + } + break; + case '?': (void) fprintf(stderr, gettext("invalid option '%c'\n"), optopt); @@ -1650,7 +1683,7 @@ zfs_do_get(int argc, char **argv) cb.cb_first = B_TRUE; /* run for each object */ - ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, NULL, + ret = zfs_for_each(argc, argv, flags, types, NULL, &cb.cb_proplist, limit, get_callback, &cb); if (cb.cb_proplist == &fake_name) Modified: projects/multi-fibv6/9/contrib/top/top.c ============================================================================== --- projects/multi-fibv6/9/contrib/top/top.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/contrib/top/top.c Mon Mar 5 17:51:15 2012 (r232555) @@ -70,7 +70,6 @@ int pcpu_stats = No; /* signal handling routines */ sigret_t leave(); -sigret_t onalrm(); sigret_t tstop(); #ifdef SIGWINCH sigret_t winch(); @@ -723,12 +722,7 @@ restart: no_command = Yes; if (!interactive) { - /* set up alarm */ - (void) signal(SIGALRM, onalrm); - (void) alarm((unsigned)delay); - - /* wait for the rest of it .... */ - pause(); + sleep(delay); } else while (no_command) { @@ -1174,11 +1168,3 @@ int status; exit(status); /*NOTREACHED*/ } - -sigret_t onalrm() /* SIGALRM handler */ - -{ - /* this is only used in batch mode to break out of the pause() */ - /* return; */ -} - Modified: projects/multi-fibv6/9/etc/rc.subr ============================================================================== --- projects/multi-fibv6/9/etc/rc.subr Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/etc/rc.subr Mon Mar 5 17:51:15 2012 (r232555) @@ -1027,9 +1027,9 @@ run_rc_script() if [ -n "$rc_fast_and_loose" ]; then set $_arg; . $_file else - ( trap "echo Script $_file interrupted; kill -QUIT $$" 3 - trap "echo Script $_file interrupted; exit 1" 2 - trap "echo Script $_file running" 29 + ( trap "echo Script $_file interrupted >&2 ; kill -QUIT $$" 3 + trap "echo Script $_file interrupted >&2 ; exit 1" 2 + trap "echo Script $_file running >&2" 29 set $_arg; . $_file ) fi fi Modified: projects/multi-fibv6/9/lib/libc/gen/Makefile.inc ============================================================================== --- projects/multi-fibv6/9/lib/libc/gen/Makefile.inc Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/lib/libc/gen/Makefile.inc Mon Mar 5 17:51:15 2012 (r232555) @@ -52,7 +52,7 @@ SYM_MAPS+=${.CURDIR}/gen/Symbol.map MAN+= alarm.3 arc4random.3 \ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \ - dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \ + dl_iterate_phdr.3 dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \ err.3 exec.3 \ feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ ftok.3 fts.3 ftw.3 \ Modified: projects/multi-fibv6/9/lib/libc/gen/aux.c ============================================================================== --- projects/multi-fibv6/9/lib/libc/gen/aux.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/lib/libc/gen/aux.c Mon Mar 5 17:51:15 2012 (r232555) @@ -1,5 +1,5 @@ /*- - * Copyright 2010 Konstantin Belousov <kib@FreeBSD.ORG>. + * Copyright 2010, 2012 Konstantin Belousov <kib@FreeBSD.ORG>. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,10 +36,34 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.h" #include "libc_private.h" -Elf_Auxinfo *__elf_aux_vector; +extern char **environ; +extern int _DYNAMIC; +#pragma weak _DYNAMIC -static pthread_once_t aux_once = PTHREAD_ONCE_INIT; +void *__elf_aux_vector; +static pthread_once_t aux_vector_once = PTHREAD_ONCE_INIT; + +static void +init_aux_vector_once(void) +{ + Elf_Addr *sp; + + sp = (Elf_Addr *)environ; + while (*sp++ != 0) + ; + __elf_aux_vector = (Elf_Auxinfo *)sp; +} +void +__init_elf_aux_vector(void) +{ + + if (&_DYNAMIC != NULL) + return; + _once(&aux_vector_once, init_aux_vector_once); +} + +static pthread_once_t aux_once = PTHREAD_ONCE_INIT; static int pagesize, osreldate, canary_len, ncpus, pagesizes_len; static char *canary, *pagesizes; @@ -86,6 +110,7 @@ _elf_aux_info(int aux, void *buf, int bu { int res; + __init_elf_aux_vector(); if (__elf_aux_vector == NULL) return (ENOSYS); _once(&aux_once, init_aux); Copied: projects/multi-fibv6/9/lib/libc/gen/dl_iterate_phdr.3 (from r232554, stable/9/lib/libc/gen/dl_iterate_phdr.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/multi-fibv6/9/lib/libc/gen/dl_iterate_phdr.3 Mon Mar 5 17:51:15 2012 (r232555, copy of r232554, stable/9/lib/libc/gen/dl_iterate_phdr.3) @@ -0,0 +1,115 @@ +.\" Copyright (c) 2005 Mark Kettenis +.\" Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org> +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" $OpenBSD: dl_iterate_phdr.3,v 1.3 2007/05/31 19:19:48 jmc Exp $ +.\" $FreeBSD$ +.Dd February 15, 2012 +.Dt DL_ITERATE_PHDR 3 +.Os +.Sh NAME +.Nm dl_iterate_phdr +.Nd iterate over program headers +.Sh LIBRARY +For the dynamically linked binaries, the service is provided by +.Xr ld-elf.so.1 1 +dynamic linker. +Statically linked programs use an implementation of +.Fn dl_iterate_phdr +from libc. +.Sh SYNOPSIS +.Fd #include <link.h> +.Ft int +.Fn dl_iterate_phdr "int (*callback)(struct dl_phdr_info *, size_t, void *)" "void *data" +.Sh DESCRIPTION +The +.Fn dl_iterate_phdr +function iterates over all ELF objects loaded into a process's +address space, calling +.Fa callback +for each object, passing it information about the object's +program headers and the +.Fa data +argument. +The iteration is aborted when all objects are passed, or when the next +.Fa callback +call returns non-zero value. +The information about the program headers is passed in a structure +that is defined as: +.Bd -literal +struct dl_phdr_info { + Elf_Addr dlpi_addr; + const char *dlpi_name; + const Elf_Phdr *dlpi_phdr; + Elf_Half dlpi_phnum; + unsigned long long int dlpi_adds; + unsigned long long int dlpi_subs; + size_t dlpi_tls_modid; + void *dlpi_tls_data; +}; +.Ed +.Pp +The members of +.Li struct dl_phdr_info +have the following meaning: +.Bl -tag -width dlpi_tls_modid +.It Fa dlpi_addr +The base address at which the object is mapped into the address +space of the calling process. +.It Fa dlpi_name +The name of the ELF object. +.It Fa dlpi_phdr +A pointer to the object's program headers. +.It Fa dlpi_phnum +The number of program headers in the object. +.It Fa dlpi_adds +The counter of the object loads performed by the dynamic linker. +.It Fa dlpi_subs +The counter of the object unloads performed by the dynamic linker. +.It Fa dlpi_tls_modid +The TLS index of the object. +.It Fa dlpi_tls_data +A pointer to the initialization data for the object TLS segment. +.El +.Pp +Future versions of +.Fx +might add more members to this structure. +To make it possible for programs to check whether any new members have +been added, the size of the structure is passed as an second argument to +.Fa callback . +.Pp +The third argument to callback is the +.Fa data +value passed to the call to +.Fn dl_iterate_phdr , +allowing the +.Fa callback +to have a context. +.Sh RETURN VALUES +The +.Fn dl_iterate_phdr +returns the value returned by the last +.Fa callback +call executed. +.Sh SEE ALSO +.Xr ld 1 , +.Xr ld-elf.so.1 1 , +.Xr dlopen 3 , +.Xr elf 5 +.Sh HISTORY +The +.Nm +function first appeared in +.Fx 7.0 . Modified: projects/multi-fibv6/9/lib/libc/gen/dlfcn.c ============================================================================== --- projects/multi-fibv6/9/lib/libc/gen/dlfcn.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/lib/libc/gen/dlfcn.c Mon Mar 5 17:51:15 2012 (r232555) @@ -34,6 +34,10 @@ __FBSDID("$FreeBSD$"); #include <dlfcn.h> #include <link.h> #include <stddef.h> +#include "namespace.h" +#include <pthread.h> +#include "un-namespace.h" +#include "libc_private.h" static char sorry[] = "Service unavailable"; @@ -138,13 +142,58 @@ _rtld_thread_init(void * li) _rtld_error(sorry); } +static pthread_once_t dl_phdr_info_once = PTHREAD_ONCE_INIT; +static struct dl_phdr_info phdr_info; + +static void +dl_init_phdr_info(void) +{ + Elf_Auxinfo *auxp; + size_t phent; + unsigned int i; + + phent = 0; + for (auxp = __elf_aux_vector; auxp->a_type != AT_NULL; auxp++) { + switch (auxp->a_type) { + case AT_BASE: + phdr_info.dlpi_addr = (Elf_Addr)auxp->a_un.a_ptr; + break; + case AT_EXECPATH: + phdr_info.dlpi_name = (const char *)auxp->a_un.a_ptr; + break; + case AT_PHDR: + phdr_info.dlpi_phdr = + (const Elf_Phdr *)auxp->a_un.a_ptr; + break; + case AT_PHENT: + phent = auxp->a_un.a_val; + break; + case AT_PHNUM: + phdr_info.dlpi_phnum = (Elf_Half)auxp->a_un.a_val; + break; + } + } + for (i = 0; i < phdr_info.dlpi_phnum; i++) { + if (phdr_info.dlpi_phdr[i].p_type == PT_TLS) { + phdr_info.dlpi_tls_modid = 1; + phdr_info.dlpi_tls_data = + (void*)phdr_info.dlpi_phdr[i].p_vaddr; + } + } + phdr_info.dlpi_adds = 1; +} + #pragma weak dl_iterate_phdr int dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *), void *data) { - _rtld_error(sorry); - return 0; + + __init_elf_aux_vector(); + if (__elf_aux_vector == NULL) + return (1); + _once(&dl_phdr_info_once, dl_init_phdr_info); + return (callback(&phdr_info, sizeof(phdr_info), data)); } #pragma weak fdlopen Modified: projects/multi-fibv6/9/lib/libc/gen/getutxent.c ============================================================================== --- projects/multi-fibv6/9/lib/libc/gen/getutxent.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/lib/libc/gen/getutxent.c Mon Mar 5 17:51:15 2012 (r232555) @@ -70,13 +70,18 @@ setutxdb(int db, const char *file) if (uf == NULL) return (-1); - /* Safety check: never use broken files. */ - if (db != UTXDB_LOG && _fstat(fileno(uf), &sb) != -1 && - sb.st_size % sizeof(struct futx) != 0) { - fclose(uf); - uf = NULL; - errno = EFTYPE; - return (-1); + if (db != UTXDB_LOG) { + /* Safety check: never use broken files. */ + if (_fstat(fileno(uf), &sb) != -1 && + sb.st_size % sizeof(struct futx) != 0) { + fclose(uf); + uf = NULL; + errno = EFTYPE; + return (-1); + } + /* Prevent reading of partial records. */ + (void)setvbuf(uf, NULL, _IOFBF, + rounddown(BUFSIZ, sizeof(struct futx))); } udb = db; Modified: projects/multi-fibv6/9/lib/libc/include/libc_private.h ============================================================================== --- projects/multi-fibv6/9/lib/libc/include/libc_private.h Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/lib/libc/include/libc_private.h Mon Mar 5 17:51:15 2012 (r232555) @@ -44,6 +44,15 @@ extern int __isthreaded; /* + * Elf_Auxinfo *__elf_aux_vector, the pointer to the ELF aux vector + * provided by kernel. Either set for us by rtld, or found at runtime + * on stack for static binaries. + * + * Type is void to avoid polluting whole libc with ELF types. + */ +extern void *__elf_aux_vector; + +/* * libc should use libc_dlopen internally, which respects a global * flag where loading of new shared objects can be restricted. */ @@ -229,6 +238,7 @@ int _execvpe(const char *, char * const int _elf_aux_info(int aux, void *buf, int buflen); struct dl_phdr_info; int __elf_phdr_match_addr(struct dl_phdr_info *, void *); +void __init_elf_aux_vector(void); void _pthread_cancel_enter(int); void _pthread_cancel_leave(int); Modified: projects/multi-fibv6/9/lib/libc/sys/kqueue.2 ============================================================================== --- projects/multi-fibv6/9/lib/libc/sys/kqueue.2 Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/lib/libc/sys/kqueue.2 Mon Mar 5 17:51:15 2012 (r232555) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 15, 2009 +.Dd February 15, 2012 .Dt KQUEUE 2 .Os .Sh NAME @@ -322,6 +322,9 @@ The sigevent portion of the AIO request .Va sigev_notify_kqueue containing the descriptor of the kqueue that the event should be attached to, +.Va sigev_notify_kevent_flags +containing the kevent flags which should be EV_ONESHOT, EV_CLEAR or +EV_DISPATCH, .Va sigev_value containing the udata value, and .Va sigev_notify Modified: projects/multi-fibv6/9/release/rc.local ============================================================================== --- projects/multi-fibv6/9/release/rc.local Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/release/rc.local Mon Mar 5 17:51:15 2012 (r232555) @@ -12,12 +12,21 @@ MACHINE=`uname -m` kbdcontrol -d >/dev/null 2>&1 if [ $? -eq 0 ]; then - # Syscons: use xterm + # Syscons: use xterm, start interesting things on other VTYs if [ ${MACHINE} = "pc98" ]; then TERM=cons25w else TERM=xterm fi + + if [ -z "$EXTERNAL_VTY_STARTED" ]; then + # Init will clean these processes up if/when the system + # goes multiuser + touch /tmp/bsdinstall_log + tail -f /tmp/bsdinstall_log > /dev/ttyv2 & + /usr/libexec/getty autologin ttyv3 & + EXTERNAL_VTY_STARTED=1 + fi else # Serial or other console echo Modified: projects/multi-fibv6/9/sbin/ifconfig/ifcarp.c ============================================================================== --- projects/multi-fibv6/9/sbin/ifconfig/ifcarp.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sbin/ifconfig/ifcarp.c Mon Mar 5 17:51:15 2012 (r232555) @@ -57,6 +57,7 @@ void setcarp_advbase(const char *,int, i void setcarp_advskew(const char *, int, int, const struct afswtch *rafp); void setcarp_passwd(const char *, int, int, const struct afswtch *rafp); void setcarp_vhid(const char *, int, int, const struct afswtch *rafp); +void setcarp_state(const char *, int, int, const struct afswtch *rafp); void carp_status(int s) @@ -175,11 +176,34 @@ setcarp_advbase(const char *val, int d, return; } +void setcarp_state(const char *val, int d, int s, const struct afswtch *afp) +{ + struct carpreq carpr; + int i; + + bzero((char *)&carpr, sizeof(struct carpreq)); + ifr.ifr_data = (caddr_t)&carpr; + + if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1) + err(1, "SIOCGVH"); + + for (i = 0; i <= CARP_MAXSTATE; i++) { + if (!strcasecmp(val, carp_states[i])) { + carpr.carpr_state = i; + break; + } + } + + if (ioctl(s, SIOCSVH, (caddr_t)&ifr) == -1) + err(1, "SIOCSVH"); +} + static struct cmd carp_cmds[] = { DEF_CMD_ARG("advbase", setcarp_advbase), DEF_CMD_ARG("advskew", setcarp_advskew), DEF_CMD_ARG("pass", setcarp_passwd), DEF_CMD_ARG("vhid", setcarp_vhid), + DEF_CMD_ARG("state", setcarp_state), }; static struct afswtch af_carp = { .af_name = "af_carp", Modified: projects/multi-fibv6/9/sbin/ifconfig/ifconfig.8 ============================================================================== --- projects/multi-fibv6/9/sbin/ifconfig/ifconfig.8 Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sbin/ifconfig/ifconfig.8 Mon Mar 5 17:51:15 2012 (r232555) @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd December 17, 2011 +.Dd March 4, 2012 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2436,6 +2436,13 @@ Set the authentication key to Set the virtual host ID. This is a required setting. Acceptable values are 1 to 255. +.It Cm state Ar state +Force the interface into state +.Ar state . +Valid states are INIT, BACKUP, and MASTER. Note that manually setting the state +to INIT is ignored by +.Xr carp 4 . +This state is set automatically when the underlying interface is down. .El .Pp The Modified: projects/multi-fibv6/9/sbin/ipfw/ipfw.8 ============================================================================== --- projects/multi-fibv6/9/sbin/ipfw/ipfw.8 Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sbin/ipfw/ipfw.8 Mon Mar 5 17:51:15 2012 (r232555) @@ -1,7 +1,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 20, 2011 +.Dd November 10, 2011 .Dt IPFW 8 .Os .Sh NAME @@ -769,7 +769,7 @@ To enable .Cm fwd a custom kernel needs to be compiled with the option .Cd "options IPFIREWALL_FORWARD" . -.It Cm nat Ar nat_nr +.It Cm nat Ar nat_nr | tablearg Pass packet to a nat instance (for network address translation, address redirect, etc.): Modified: projects/multi-fibv6/9/sbin/mount_ntfs/mount_ntfs.c ============================================================================== --- projects/multi-fibv6/9/sbin/mount_ntfs/mount_ntfs.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sbin/mount_ntfs/mount_ntfs.c Mon Mar 5 17:51:15 2012 (r232555) @@ -160,7 +160,7 @@ main(int argc, char *argv[]) } /* - * Resolve the mountpoint with realpath(3) and remove unnecessary + * Resolve the mountpoint with realpath(3) and remove unnecessary * slashes from the devicename if there are any. */ (void)checkpath(dir, mntpath); Modified: projects/multi-fibv6/9/share/man/man9/devtoname.9 ============================================================================== --- projects/multi-fibv6/9/share/man/man9/devtoname.9 Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/share/man/man9/devtoname.9 Mon Mar 5 17:51:15 2012 (r232555) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 19, 2012 +.Dd February 10, 2012 .Dt DEVTONAME 9 .Os .Sh NAME @@ -41,15 +41,6 @@ The function returns a pointer to the name of the device passed to it. The name is whatever was set to it in .Fn make_dev . -If no name is associated with -.Va dev , -a pointer to a string consisting of a -.Dq # -followed by -.Dq Va major Ns / Ns Va minor -as it applies to -.Va dev -is returned. .Sh HISTORY The .Fn devtoname Modified: projects/multi-fibv6/9/sys/arm/arm/irq_dispatch.S ============================================================================== --- projects/multi-fibv6/9/sys/arm/arm/irq_dispatch.S Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/arm/arm/irq_dispatch.S Mon Mar 5 17:51:15 2012 (r232555) @@ -98,10 +98,9 @@ ASENTRY_NP(irq_entry) PULLFRAMEFROMSVCANDEXIT movs pc, lr /* Exit */ - .bss + .data .align 0 - .global _C_LABEL(intrnames), _C_LABEL(sintrnames) .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt) _C_LABEL(intrnames): Modified: projects/multi-fibv6/9/sys/arm/arm/pmap.c ============================================================================== --- projects/multi-fibv6/9/sys/arm/arm/pmap.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/arm/arm/pmap.c Mon Mar 5 17:51:15 2012 (r232555) @@ -4044,6 +4044,7 @@ pmap_zero_page_generic(vm_paddr_t phys, * order to work without corruption when write-allocate is enabled. */ *cdst_pte = L2_S_PROTO | phys | L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE); + PTE_SYNC(cdst_pte); cpu_tlb_flushD_SE(cdstp); cpu_cpwait(); if (off || size != PAGE_SIZE) Modified: projects/multi-fibv6/9/sys/arm/include/pmap.h ============================================================================== --- projects/multi-fibv6/9/sys/arm/include/pmap.h Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/arm/include/pmap.h Mon Mar 5 17:51:15 2012 (r232555) @@ -382,7 +382,8 @@ do { \ if (PMAP_NEEDS_PTE_SYNC) { \ cpu_dcache_wb_range((vm_offset_t)(pte), sizeof(pt_entry_t));\ cpu_l2cache_wb_range((vm_offset_t)(pte), sizeof(pt_entry_t));\ - }\ + } else \ + cpu_drain_writebuf(); \ } while (/*CONSTCOND*/0) #define PTE_SYNC_RANGE(pte, cnt) \ @@ -392,7 +393,8 @@ do { \ (cnt) << 2); /* * sizeof(pt_entry_t) */ \ cpu_l2cache_wb_range((vm_offset_t)(pte), \ (cnt) << 2); /* * sizeof(pt_entry_t) */ \ - } \ + } else \ + cpu_drain_writebuf(); \ } while (/*CONSTCOND*/0) extern pt_entry_t pte_l1_s_cache_mode; Modified: projects/multi-fibv6/9/sys/boot/i386/libi386/vidconsole.c ============================================================================== --- projects/multi-fibv6/9/sys/boot/i386/libi386/vidconsole.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/boot/i386/libi386/vidconsole.c Mon Mar 5 17:51:15 2012 (r232555) @@ -623,10 +623,10 @@ probe_keyboard(void) #endif if (i == KBD_ECHO) { /* got the right answer */ - return (0); + return (1); } } - return (1); + return (0); } #endif /* KEYBOARD_PROBE */ Modified: projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/Makefile ============================================================================== --- projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/Makefile Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/Makefile Mon Mar 5 17:51:15 2012 (r232555) @@ -8,17 +8,18 @@ BINDIR?= /boot INSTALLFLAGS= -b FILES= boot1.hfs -SRCS= boot1.c ashldi3.c +SRCS= boot1.c ashldi3.c syncicache.c INTERNALPROG= NO_MAN= CFLAGS= -ffreestanding -msoft-float -Os \ - -I${.CURDIR}/../../common -I${.CURDIR}/../../../ + -I${.CURDIR}/../../common -I${.CURDIR}/../../../ \ + -D_STANDALONE LDFLAGS=-nostdlib -static -N .include "${.CURDIR}/../Makefile.inc" -.PATH: ${.CURDIR}/../../../libkern ${.CURDIR} +.PATH: ${.CURDIR}/../../../libkern ${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR} # The following inserts out objects into a template HFS # created by generate-hfs.sh Modified: projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/boot1.c ============================================================================== --- projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/boot1.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/boot1.c Mon Mar 5 17:51:15 2012 (r232555) @@ -77,6 +77,8 @@ static int __sputc(char c, void *arg); static char *__uitoa(char *buf, u_int val, int base); static char *__ultoa(char *buf, u_long val, int base); +void __syncicache(void *, int); + /* * Open Firmware interface functions */ @@ -523,6 +525,7 @@ load(const char *fname) } if (ph.p_filesz != ph.p_memsz) bzero(p + ph.p_filesz, ph.p_memsz - ph.p_filesz); + __syncicache(p, ph.p_memsz); } ofw_close(bootdev); (*(void (*)(void *, int, ofwfp_t, char *, int))eh.e_entry)(NULL, 0, Modified: projects/multi-fibv6/9/sys/cam/ctl/ctl_private.h ============================================================================== --- projects/multi-fibv6/9/sys/cam/ctl/ctl_private.h Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/cam/ctl/ctl_private.h Mon Mar 5 17:51:15 2012 (r232555) @@ -297,7 +297,7 @@ struct ctl_page_index { #define CTL_PAGE_DEFAULT 0x02 #define CTL_PAGE_SAVED 0x03 -static struct ctl_page_index page_index_template[] = { +static const struct ctl_page_index page_index_template[] = { {SMS_FORMAT_DEVICE_PAGE, 0, sizeof(struct scsi_format_page), NULL, CTL_PAGE_FLAG_DISK_ONLY, NULL, NULL}, {SMS_RIGID_DISK_PAGE, 0, sizeof(struct scsi_rigid_disk_page), NULL, Modified: projects/multi-fibv6/9/sys/compat/freebsd32/freebsd32_signal.h ============================================================================== --- projects/multi-fibv6/9/sys/compat/freebsd32/freebsd32_signal.h Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/compat/freebsd32/freebsd32_signal.h Mon Mar 5 17:51:15 2012 (r232555) @@ -92,6 +92,7 @@ struct sigevent32 { uint32_t _function; uint32_t _attribute; } _sigev_thread; + unsigned short _kevent_flags; uint32_t __spare__[8]; } _sigev_un; }; Modified: projects/multi-fibv6/9/sys/compat/linux/linux_misc.c ============================================================================== --- projects/multi-fibv6/9/sys/compat/linux/linux_misc.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/compat/linux/linux_misc.c Mon Mar 5 17:51:15 2012 (r232555) @@ -229,9 +229,9 @@ linux_uselib(struct thread *td, struct l struct vattr attr; vm_offset_t vmaddr; unsigned long file_offset; - vm_offset_t buffer; unsigned long bss_size; char *library; + ssize_t aresid; int error; int locked, vfslocked; @@ -308,8 +308,8 @@ linux_uselib(struct thread *td, struct l if (error) goto cleanup; - /* Pull in executable header into kernel_map */ - error = vm_mmap(kernel_map, (vm_offset_t *)&a_out, PAGE_SIZE, + /* Pull in executable header into exec_map */ + error = vm_mmap(exec_map, (vm_offset_t *)&a_out, PAGE_SIZE, VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp, 0); if (error) goto cleanup; @@ -402,24 +402,15 @@ linux_uselib(struct thread *td, struct l if (error) goto cleanup; - /* map file into kernel_map */ - error = vm_mmap(kernel_map, &buffer, - round_page(a_out->a_text + a_out->a_data + file_offset), - VM_PROT_READ, VM_PROT_READ, 0, OBJT_VNODE, vp, - trunc_page(file_offset)); - if (error) + error = vn_rdwr(UIO_READ, vp, (void *)vmaddr, file_offset, + a_out->a_text + a_out->a_data, UIO_USERSPACE, 0, + td->td_ucred, NOCRED, &aresid, td); + if (error != 0) goto cleanup; - - /* copy from kernel VM space to user space */ - error = copyout(PTRIN(buffer + file_offset), - (void *)vmaddr, a_out->a_text + a_out->a_data); - - /* release temporary kernel space */ - vm_map_remove(kernel_map, buffer, buffer + - round_page(a_out->a_text + a_out->a_data + file_offset)); - - if (error) + if (aresid != 0) { + error = ENOEXEC; goto cleanup; + } } else { #ifdef DEBUG printf("uselib: Page aligned binary %lu\n", file_offset); @@ -463,10 +454,9 @@ cleanup: VFS_UNLOCK_GIANT(vfslocked); } - /* Release the kernel mapping. */ + /* Release the temporary mapping. */ if (a_out) - vm_map_remove(kernel_map, (vm_offset_t)a_out, - (vm_offset_t)a_out + PAGE_SIZE); + kmem_free_wakeup(exec_map, (vm_offset_t)a_out, PAGE_SIZE); return (error); } Modified: projects/multi-fibv6/9/sys/compat/linux/linux_stats.c ============================================================================== --- projects/multi-fibv6/9/sys/compat/linux/linux_stats.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/compat/linux/linux_stats.c Mon Mar 5 17:51:15 2012 (r232555) @@ -66,7 +66,7 @@ translate_vnhook_major_minor(struct vnod int major, minor; if (vp->v_type == VCHR && vp->v_rdev != NULL && - linux_driver_get_major_minor(vp->v_rdev->si_name, + linux_driver_get_major_minor(devtoname(vp->v_rdev), &major, &minor) == 0) { sb->st_rdev = (major << 8 | minor); } @@ -149,14 +149,14 @@ translate_fd_major_minor(struct thread * return; vp = fp->f_vnode; if (vp != NULL && vp->v_rdev != NULL && - linux_driver_get_major_minor(vp->v_rdev->si_name, + linux_driver_get_major_minor(devtoname(vp->v_rdev), &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); } else if (fp->f_type == DTYPE_PTS) { struct tty *tp = fp->f_data; /* Convert the numbers for the slave device. */ - if (linux_driver_get_major_minor(tp->t_dev->si_name, + if (linux_driver_get_major_minor(devtoname(tp->t_dev), &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); } Modified: projects/multi-fibv6/9/sys/compat/linux/linux_util.c ============================================================================== --- projects/multi-fibv6/9/sys/compat/linux/linux_util.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/compat/linux/linux_util.c Mon Mar 5 17:51:15 2012 (r232555) @@ -124,7 +124,7 @@ linux_driver_get_name_dev(device_t dev) } int -linux_driver_get_major_minor(char *node, int *major, int *minor) +linux_driver_get_major_minor(const char *node, int *major, int *minor) { struct device_element *de; Modified: projects/multi-fibv6/9/sys/compat/linux/linux_util.h ============================================================================== --- projects/multi-fibv6/9/sys/compat/linux/linux_util.h Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/compat/linux/linux_util.h Mon Mar 5 17:51:15 2012 (r232555) @@ -97,7 +97,7 @@ struct linux_device_handler { int linux_device_register_handler(struct linux_device_handler *h); int linux_device_unregister_handler(struct linux_device_handler *h); char *linux_driver_get_name_dev(device_t dev); -int linux_driver_get_major_minor(char *node, int *major, int *minor); +int linux_driver_get_major_minor(const char *node, int *major, int *minor); char *linux_get_char_devices(void); void linux_free_get_char_devices(char *string); Modified: projects/multi-fibv6/9/sys/compat/svr4/imgact_svr4.c ============================================================================== --- projects/multi-fibv6/9/sys/compat/svr4/imgact_svr4.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/compat/svr4/imgact_svr4.c Mon Mar 5 17:51:15 2012 (r232555) @@ -66,8 +66,8 @@ exec_svr4_imgact(imgp) struct vmspace *vmspace; vm_offset_t vmaddr; unsigned long virtual_offset, file_offset; - vm_offset_t buffer; unsigned long bss_size; + ssize_t aresid; int error; if (((a_out->a_magic >> 16) & 0xff) != 0x64) @@ -145,21 +145,15 @@ exec_svr4_imgact(imgp) if (error) goto fail; - error = vm_mmap(kernel_map, &buffer, - round_page(a_out->a_text + a_out->a_data + file_offset), - VM_PROT_READ, VM_PROT_READ, 0, - OBJT_VNODE, imgp->vp, trunc_page(file_offset)); - if (error) - goto fail; - - error = copyout((caddr_t)(buffer + file_offset), (caddr_t)vmaddr, - a_out->a_text + a_out->a_data); - - vm_map_remove(kernel_map, buffer, - buffer + round_page(a_out->a_text + a_out->a_data + file_offset)); - - if (error) - goto fail; + error = vn_rdwr(UIO_READ, imgp->vp, (void *)vmaddr, file_offset, + a_out->a_text + a_out->a_data, UIO_USERSPACE, 0, + curthread->td_ucred, NOCRED, &aresid, curthread); + if (error != 0) + goto fail; + if (aresid != 0) { + error = ENOEXEC; + goto fail; + } /* * remove write enable on the 'text' part Modified: projects/multi-fibv6/9/sys/conf/kern.mk ============================================================================== --- projects/multi-fibv6/9/sys/conf/kern.mk Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/conf/kern.mk Mon Mar 5 17:51:15 2012 (r232555) @@ -22,6 +22,7 @@ NO_WSHIFT_COUNT_NEGATIVE= -Wno-shift-cou NO_WSHIFT_COUNT_OVERFLOW= -Wno-shift-count-overflow NO_WUNUSED_VALUE= -Wno-unused-value NO_WSELF_ASSIGN= -Wno-self-assign +NO_WFORMAT_SECURITY= -Wno-format-security # Several other warnings which might be useful in some cases, but not severe # enough to error out the whole kernel build. Display them anyway, so there is # some incentive to fix them eventually. Modified: projects/multi-fibv6/9/sys/dev/acpica/acpi_thermal.c ============================================================================== --- projects/multi-fibv6/9/sys/dev/acpica/acpi_thermal.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/dev/acpica/acpi_thermal.c Mon Mar 5 17:51:15 2012 (r232555) @@ -245,7 +245,7 @@ acpi_tz_attach(device_t dev) SYSCTL_ADD_INT(&acpi_tz_sysctl_ctx, SYSCTL_CHILDREN(acpi_tz_sysctl_tree), OID_AUTO, "polling_rate", CTLFLAG_RW, - &acpi_tz_polling_rate, 0, "monitor polling rate"); + &acpi_tz_polling_rate, 0, "monitor polling interval in seconds"); SYSCTL_ADD_INT(&acpi_tz_sysctl_ctx, SYSCTL_CHILDREN(acpi_tz_sysctl_tree), OID_AUTO, "user_override", CTLFLAG_RW, &acpi_tz_override, 0, Modified: projects/multi-fibv6/9/sys/dev/isci/isci.c ============================================================================== --- projects/multi-fibv6/9/sys/dev/isci/isci.c Mon Mar 5 17:39:13 2012 (r232554) +++ projects/multi-fibv6/9/sys/dev/isci/isci.c Mon Mar 5 17:51:15 2012 (r232555) @@ -98,7 +98,11 @@ static struct _pcsid { 0x1d688086, "Intel(R) C600 Series Chipset SAS Controller" }, { 0x1d698086, "Intel(R) C600 Series Chipset SAS Controller" }, { 0x1d6a8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, - { 0x1d6b8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, + { 0x1d6b8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, + { 0x1d6c8086, "Intel(R) C600 Series Chipset SAS Controller" }, + { 0x1d6d8086, "Intel(R) C600 Series Chipset SAS Controller" }, + { 0x1d6e8086, "Intel(R) C600 Series Chipset SAS Controller" }, + { 0x1d6f8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, { 0x00000000, NULL } }; @@ -114,7 +118,7 @@ isci_probe (device_t device) if (ep->desc) { device_set_desc(device, ep->desc); - return (0); + return (BUS_PROBE_DEFAULT); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203051751.q25HpGMq097037>