svn commit: r191750 - in projects/mesh11s: . bin/rm contrib/bind9
contrib/cpio contrib/csup contrib/file contrib/gdb
contrib/gdtoa contrib/libpcap contrib/ncurses contrib/netcat
contrib/ntp contrib...
Rui Paulo
rpaulo at FreeBSD.org
Sat May 2 18:47:25 UTC 2009
Author: rpaulo
Date: Sat May 2 18:47:23 2009
New Revision: 191750
URL: http://svn.freebsd.org/changeset/base/191750
Log:
MFC 191639:191746.
Added:
projects/mesh11s/sys/netinet6/in6_mcast.c
- copied unchanged from r191746, head/sys/netinet6/in6_mcast.c
projects/mesh11s/sys/netinet6/mld6.h
- copied unchanged from r191746, head/sys/netinet6/mld6.h
Deleted:
projects/mesh11s/sys/dev/usb/wlan/usb_wlan.h
Modified:
projects/mesh11s/ (props changed)
projects/mesh11s/UPDATING
projects/mesh11s/bin/rm/rm.c
projects/mesh11s/contrib/bind9/ (props changed)
projects/mesh11s/contrib/cpio/ (props changed)
projects/mesh11s/contrib/csup/ (props changed)
projects/mesh11s/contrib/file/ (props changed)
projects/mesh11s/contrib/gdb/ (props changed)
projects/mesh11s/contrib/gdtoa/ (props changed)
projects/mesh11s/contrib/libpcap/ (props changed)
projects/mesh11s/contrib/ncurses/ (props changed)
projects/mesh11s/contrib/netcat/ (props changed)
projects/mesh11s/contrib/ntp/ (props changed)
projects/mesh11s/contrib/openbsm/ (props changed)
projects/mesh11s/contrib/openpam/ (props changed)
projects/mesh11s/contrib/pf/ (props changed)
projects/mesh11s/contrib/sendmail/ (props changed)
projects/mesh11s/contrib/tcpdump/ (props changed)
projects/mesh11s/contrib/top/ (props changed)
projects/mesh11s/contrib/top/install-sh (props changed)
projects/mesh11s/contrib/wpa/ (props changed)
projects/mesh11s/crypto/openssh/ (props changed)
projects/mesh11s/crypto/openssl/ (props changed)
projects/mesh11s/lib/libc/ (props changed)
projects/mesh11s/lib/libc/net/sourcefilter.c
projects/mesh11s/lib/libc/stdio/asprintf.c (props changed)
projects/mesh11s/lib/libc/stdtime/ (props changed)
projects/mesh11s/lib/libc/string/ffsll.c (props changed)
projects/mesh11s/lib/libc/string/flsll.c (props changed)
projects/mesh11s/lib/libc/string/wcpcpy.c (props changed)
projects/mesh11s/lib/libc/string/wcpncpy.c (props changed)
projects/mesh11s/lib/libc/sys/Makefile.inc
projects/mesh11s/lib/libc/sys/Symbol.map
projects/mesh11s/lib/libc/sys/jail.2
projects/mesh11s/lib/libusb/ (props changed)
projects/mesh11s/lib/libusb/libusb.3 (props changed)
projects/mesh11s/lib/libusb/usb.h (props changed)
projects/mesh11s/lib/libutil/ (props changed)
projects/mesh11s/sbin/ (props changed)
projects/mesh11s/sbin/geom/class/journal/gjournal.8
projects/mesh11s/sbin/ifconfig/iflagg.c
projects/mesh11s/sbin/ipfw/ (props changed)
projects/mesh11s/sbin/newfs/newfs.8
projects/mesh11s/sbin/tunefs/tunefs.8
projects/mesh11s/share/man/man4/ng_hole.4
projects/mesh11s/share/man/man4/u3g.4
projects/mesh11s/share/misc/bsd-family-tree
projects/mesh11s/share/zoneinfo/ (props changed)
projects/mesh11s/sys/ (props changed)
projects/mesh11s/sys/amd64/amd64/identcpu.c
projects/mesh11s/sys/amd64/amd64/local_apic.c
projects/mesh11s/sys/amd64/amd64/mp_machdep.c
projects/mesh11s/sys/amd64/conf/GENERIC
projects/mesh11s/sys/amd64/include/apicvar.h
projects/mesh11s/sys/amd64/include/clock.h
projects/mesh11s/sys/amd64/include/smp.h
projects/mesh11s/sys/amd64/include/specialreg.h
projects/mesh11s/sys/amd64/include/xen/ (props changed)
projects/mesh11s/sys/amd64/isa/clock.c
projects/mesh11s/sys/amd64/linux32/linux32_sysvec.c
projects/mesh11s/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c
projects/mesh11s/sys/compat/freebsd32/freebsd32_misc.c
projects/mesh11s/sys/compat/freebsd32/freebsd32_proto.h
projects/mesh11s/sys/compat/freebsd32/freebsd32_syscall.h
projects/mesh11s/sys/compat/freebsd32/freebsd32_syscalls.c
projects/mesh11s/sys/compat/freebsd32/freebsd32_sysent.c
projects/mesh11s/sys/compat/freebsd32/syscalls.master
projects/mesh11s/sys/compat/linux/linux_futex.c
projects/mesh11s/sys/compat/linux/linux_futex.h
projects/mesh11s/sys/compat/linux/linux_socket.c
projects/mesh11s/sys/conf/NOTES
projects/mesh11s/sys/conf/files
projects/mesh11s/sys/conf/options
projects/mesh11s/sys/contrib/pf/ (props changed)
projects/mesh11s/sys/dev/acpica/acpi.c
projects/mesh11s/sys/dev/ata/ata-all.h
projects/mesh11s/sys/dev/ata/ata-disk.c
projects/mesh11s/sys/dev/ata/ata-pci.c
projects/mesh11s/sys/dev/ata/ata-queue.c
projects/mesh11s/sys/dev/ata/ata-sata.c
projects/mesh11s/sys/dev/ata/ata-usb.c (props changed)
projects/mesh11s/sys/dev/ata/chipsets/ata-ahci.c
projects/mesh11s/sys/dev/cxgb/ (props changed)
projects/mesh11s/sys/dev/if_ndis/if_ndis.c
projects/mesh11s/sys/dev/if_ndis/if_ndisvar.h
projects/mesh11s/sys/dev/ipw/if_ipw.c
projects/mesh11s/sys/dev/ipw/if_ipwvar.h
projects/mesh11s/sys/dev/iwi/if_iwi.c
projects/mesh11s/sys/dev/iwi/if_iwivar.h
projects/mesh11s/sys/dev/iwn/if_iwn.c
projects/mesh11s/sys/dev/iwn/if_iwnvar.h
projects/mesh11s/sys/dev/sk/if_sk.c
projects/mesh11s/sys/dev/sound/usb/uaudio.c (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudio.h (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudio_pcm.c (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudioreg.h (props changed)
projects/mesh11s/sys/dev/usb/README.TXT (props changed)
projects/mesh11s/sys/dev/usb/bluetooth/TODO.TXT (props changed)
projects/mesh11s/sys/dev/usb/bluetooth/ng_ubt.c (props changed)
projects/mesh11s/sys/dev/usb/bluetooth/ng_ubt_var.h (props changed)
projects/mesh11s/sys/dev/usb/bluetooth/ubtbcmfw.c (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_ixp4xx.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_mbus.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg.c (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg.h (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/usb_controller.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/input/uhid.c (props changed)
projects/mesh11s/sys/dev/usb/input/ukbd.c (props changed)
projects/mesh11s/sys/dev/usb/input/ums.c (props changed)
projects/mesh11s/sys/dev/usb/input/usb_rdesc.h (props changed)
projects/mesh11s/sys/dev/usb/misc/udbp.c (props changed)
projects/mesh11s/sys/dev/usb/misc/udbp.h (props changed)
projects/mesh11s/sys/dev/usb/misc/ufm.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_aue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_auereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_axe.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_axereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_cdce.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_cdcereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_cue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_cuereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_kue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_kuefw.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_kuereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_rue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_ruereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_udav.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_udavreg.h (props changed)
projects/mesh11s/sys/dev/usb/net/usb_ethernet.c (props changed)
projects/mesh11s/sys/dev/usb/net/usb_ethernet.h (props changed)
projects/mesh11s/sys/dev/usb/quirk/usb_quirk.c (props changed)
projects/mesh11s/sys/dev/usb/quirk/usb_quirk.h (props changed)
projects/mesh11s/sys/dev/usb/serial/u3g.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uark.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ubsa.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ubser.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uchcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ucycom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ufoma.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uftdi.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uftdi_reg.h (props changed)
projects/mesh11s/sys/dev/usb/serial/ugensa.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uipaq.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ulpt.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umct.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umodem.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umoscom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uplcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/usb_serial.c (props changed)
projects/mesh11s/sys/dev/usb/serial/usb_serial.h (props changed)
projects/mesh11s/sys/dev/usb/serial/uslcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uvisor.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uvscom.c (props changed)
projects/mesh11s/sys/dev/usb/storage/rio500_usb.h (props changed)
projects/mesh11s/sys/dev/usb/storage/umass.c (props changed)
projects/mesh11s/sys/dev/usb/storage/urio.c (props changed)
projects/mesh11s/sys/dev/usb/storage/ustorage_fs.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template.h (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_cdce.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_msc.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_mtp.c (props changed)
projects/mesh11s/sys/dev/usb/ufm_ioctl.h (props changed)
projects/mesh11s/sys/dev/usb/usb.h (props changed)
projects/mesh11s/sys/dev/usb/usb_bus.h (props changed)
projects/mesh11s/sys/dev/usb/usb_busdma.c (props changed)
projects/mesh11s/sys/dev/usb/usb_busdma.h (props changed)
projects/mesh11s/sys/dev/usb/usb_cdc.h (props changed)
projects/mesh11s/sys/dev/usb/usb_compat_linux.c (props changed)
projects/mesh11s/sys/dev/usb/usb_compat_linux.h (props changed)
projects/mesh11s/sys/dev/usb/usb_controller.h (props changed)
projects/mesh11s/sys/dev/usb/usb_core.c (props changed)
projects/mesh11s/sys/dev/usb/usb_core.h (props changed)
projects/mesh11s/sys/dev/usb/usb_debug.c (props changed)
projects/mesh11s/sys/dev/usb/usb_debug.h (props changed)
projects/mesh11s/sys/dev/usb/usb_defs.h (props changed)
projects/mesh11s/sys/dev/usb/usb_dev.c (props changed)
projects/mesh11s/sys/dev/usb/usb_dev.h (props changed)
projects/mesh11s/sys/dev/usb/usb_device.c (props changed)
projects/mesh11s/sys/dev/usb/usb_device.h (props changed)
projects/mesh11s/sys/dev/usb/usb_dynamic.c (props changed)
projects/mesh11s/sys/dev/usb/usb_dynamic.h (props changed)
projects/mesh11s/sys/dev/usb/usb_endian.h (props changed)
projects/mesh11s/sys/dev/usb/usb_error.c (props changed)
projects/mesh11s/sys/dev/usb/usb_error.h (props changed)
projects/mesh11s/sys/dev/usb/usb_generic.c (props changed)
projects/mesh11s/sys/dev/usb/usb_generic.h (props changed)
projects/mesh11s/sys/dev/usb/usb_handle_request.c (props changed)
projects/mesh11s/sys/dev/usb/usb_handle_request.h (props changed)
projects/mesh11s/sys/dev/usb/usb_hid.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hid.h (props changed)
projects/mesh11s/sys/dev/usb/usb_hub.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hub.h (props changed)
projects/mesh11s/sys/dev/usb/usb_if.m (props changed)
projects/mesh11s/sys/dev/usb/usb_ioctl.h (props changed)
projects/mesh11s/sys/dev/usb/usb_lookup.c (props changed)
projects/mesh11s/sys/dev/usb/usb_lookup.h (props changed)
projects/mesh11s/sys/dev/usb/usb_mbuf.c (props changed)
projects/mesh11s/sys/dev/usb/usb_mbuf.h (props changed)
projects/mesh11s/sys/dev/usb/usb_mfunc.h (props changed)
projects/mesh11s/sys/dev/usb/usb_msctest.c (props changed)
projects/mesh11s/sys/dev/usb/usb_msctest.h (props changed)
projects/mesh11s/sys/dev/usb/usb_parse.c (props changed)
projects/mesh11s/sys/dev/usb/usb_parse.h (props changed)
projects/mesh11s/sys/dev/usb/usb_pci.h (props changed)
projects/mesh11s/sys/dev/usb/usb_process.c (props changed)
projects/mesh11s/sys/dev/usb/usb_process.h (props changed)
projects/mesh11s/sys/dev/usb/usb_request.c (props changed)
projects/mesh11s/sys/dev/usb/usb_request.h (props changed)
projects/mesh11s/sys/dev/usb/usb_revision.h (props changed)
projects/mesh11s/sys/dev/usb/usb_transfer.c (props changed)
projects/mesh11s/sys/dev/usb/usb_transfer.h (props changed)
projects/mesh11s/sys/dev/usb/usb_util.c (props changed)
projects/mesh11s/sys/dev/usb/usb_util.h (props changed)
projects/mesh11s/sys/dev/usb/usbdevs (props changed)
projects/mesh11s/sys/dev/usb/usbhid.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rum.c (contents, props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumfw.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumreg.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumvar.h (contents, props changed)
projects/mesh11s/sys/dev/usb/wlan/if_uath.c
projects/mesh11s/sys/dev/usb/wlan/if_uathvar.h
projects/mesh11s/sys/dev/usb/wlan/if_ural.c (contents, props changed)
projects/mesh11s/sys/dev/usb/wlan/if_uralreg.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_uralvar.h (contents, props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zyd.c (contents, props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zydfw.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zydreg.h (contents, props changed)
projects/mesh11s/sys/dev/wi/if_wi.c
projects/mesh11s/sys/dev/wi/if_wivar.h
projects/mesh11s/sys/dev/wpi/if_wpi.c
projects/mesh11s/sys/dev/wpi/if_wpivar.h
projects/mesh11s/sys/dev/xen/netfront/ (props changed)
projects/mesh11s/sys/dev/xen/xenpci/ (props changed)
projects/mesh11s/sys/i386/conf/GENERIC
projects/mesh11s/sys/i386/i386/identcpu.c
projects/mesh11s/sys/i386/i386/local_apic.c
projects/mesh11s/sys/i386/i386/mp_machdep.c
projects/mesh11s/sys/i386/include/apicvar.h
projects/mesh11s/sys/i386/include/clock.h
projects/mesh11s/sys/i386/include/smp.h
projects/mesh11s/sys/i386/include/specialreg.h
projects/mesh11s/sys/i386/isa/clock.c
projects/mesh11s/sys/i386/linux/linux_sysvec.c
projects/mesh11s/sys/isa/atrtc.c
projects/mesh11s/sys/kern/init_sysent.c
projects/mesh11s/sys/kern/kern_jail.c
projects/mesh11s/sys/kern/kern_mib.c
projects/mesh11s/sys/kern/kern_osd.c
projects/mesh11s/sys/kern/kern_sysctl.c
projects/mesh11s/sys/kern/kern_vimage.c
projects/mesh11s/sys/kern/sched_ule.c
projects/mesh11s/sys/kern/subr_smp.c
projects/mesh11s/sys/kern/subr_witness.c
projects/mesh11s/sys/kern/syscalls.c
projects/mesh11s/sys/kern/syscalls.master
projects/mesh11s/sys/kern/systrace_args.c
projects/mesh11s/sys/kern/uipc_socket.c
projects/mesh11s/sys/legacy/dev/ata/ata-usb.c (props changed)
projects/mesh11s/sys/legacy/dev/sound/usb/uaudio.c (props changed)
projects/mesh11s/sys/legacy/dev/sound/usb/uaudio.h (props changed)
projects/mesh11s/sys/legacy/dev/sound/usb/uaudio_pcm.c (props changed)
projects/mesh11s/sys/legacy/dev/sound/usb/uaudioreg.h (props changed)
projects/mesh11s/sys/legacy/dev/usb/ (props changed)
projects/mesh11s/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed)
projects/mesh11s/sys/mips/include/pmap.h
projects/mesh11s/sys/mips/mips/pmap.c
projects/mesh11s/sys/modules/Makefile
projects/mesh11s/sys/modules/dtrace/dtnfsclient/ (props changed)
projects/mesh11s/sys/modules/ip6_mroute_mod/ (props changed)
projects/mesh11s/sys/modules/ipmi/ipmi_linux/ (props changed)
projects/mesh11s/sys/net/ieee8023ad_lacp.c
projects/mesh11s/sys/net/if.c
projects/mesh11s/sys/net/if_bridge.c
projects/mesh11s/sys/net/if_gif.c
projects/mesh11s/sys/net/if_gif.h
projects/mesh11s/sys/net/if_lagg.c
projects/mesh11s/sys/net/if_mib.c
projects/mesh11s/sys/net/if_var.h
projects/mesh11s/sys/net/route.c
projects/mesh11s/sys/net/vnet.h
projects/mesh11s/sys/net80211/ieee80211.c
projects/mesh11s/sys/net80211/ieee80211_ddb.c
projects/mesh11s/sys/net80211/ieee80211_freebsd.h
projects/mesh11s/sys/net80211/ieee80211_ioctl.c
projects/mesh11s/sys/net80211/ieee80211_node.c
projects/mesh11s/sys/net80211/ieee80211_node.h
projects/mesh11s/sys/net80211/ieee80211_proto.c
projects/mesh11s/sys/net80211/ieee80211_scan.c
projects/mesh11s/sys/net80211/ieee80211_scan.h
projects/mesh11s/sys/net80211/ieee80211_scan_sta.c
projects/mesh11s/sys/net80211/ieee80211_var.h
projects/mesh11s/sys/netinet/icmp6.h
projects/mesh11s/sys/netinet/igmp.c
projects/mesh11s/sys/netinet/in_mcast.c
projects/mesh11s/sys/netinet/in_pcb.c
projects/mesh11s/sys/netinet/in_pcb.h
projects/mesh11s/sys/netinet/ip_carp.c
projects/mesh11s/sys/netinet/ip_divert.c
projects/mesh11s/sys/netinet/ip_fw.h
projects/mesh11s/sys/netinet/ip_fw_pfil.c
projects/mesh11s/sys/netinet/ip_input.c
projects/mesh11s/sys/netinet/ip_mroute.c
projects/mesh11s/sys/netinet/raw_ip.c
projects/mesh11s/sys/netinet/tcp_subr.c
projects/mesh11s/sys/netinet/tcp_syncache.c
projects/mesh11s/sys/netinet/tcp_syncache.h
projects/mesh11s/sys/netinet/tcp_timewait.c
projects/mesh11s/sys/netinet/tcp_var.h
projects/mesh11s/sys/netinet/udp_usrreq.c
projects/mesh11s/sys/netinet/vinet.h
projects/mesh11s/sys/netinet6/icmp6.c
projects/mesh11s/sys/netinet6/in6.c
projects/mesh11s/sys/netinet6/in6.h
projects/mesh11s/sys/netinet6/in6_ifattach.c
projects/mesh11s/sys/netinet6/in6_pcb.c
projects/mesh11s/sys/netinet6/in6_proto.c
projects/mesh11s/sys/netinet6/in6_var.h
projects/mesh11s/sys/netinet6/ip6_input.c
projects/mesh11s/sys/netinet6/ip6_mroute.c
projects/mesh11s/sys/netinet6/ip6_output.c
projects/mesh11s/sys/netinet6/ip6_var.h
projects/mesh11s/sys/netinet6/mld6.c
projects/mesh11s/sys/netinet6/mld6_var.h
projects/mesh11s/sys/netinet6/nd6.c
projects/mesh11s/sys/netinet6/raw_ip6.c
projects/mesh11s/sys/netinet6/udp6_usrreq.c
projects/mesh11s/sys/netinet6/vinet6.h
projects/mesh11s/sys/netipsec/ipsec.c
projects/mesh11s/sys/netipsec/key.c
projects/mesh11s/sys/netipsec/vipsec.h
projects/mesh11s/sys/pc98/conf/GENERIC
projects/mesh11s/sys/security/mac/mac_atalk.c
projects/mesh11s/sys/security/mac/mac_audit.c
projects/mesh11s/sys/security/mac/mac_cred.c
projects/mesh11s/sys/security/mac/mac_inet.c
projects/mesh11s/sys/security/mac/mac_inet6.c
projects/mesh11s/sys/security/mac/mac_internal.h
projects/mesh11s/sys/security/mac/mac_net.c
projects/mesh11s/sys/security/mac/mac_pipe.c
projects/mesh11s/sys/security/mac/mac_posix_sem.c
projects/mesh11s/sys/security/mac/mac_posix_shm.c
projects/mesh11s/sys/security/mac/mac_priv.c
projects/mesh11s/sys/security/mac/mac_process.c
projects/mesh11s/sys/security/mac/mac_socket.c
projects/mesh11s/sys/security/mac/mac_system.c
projects/mesh11s/sys/security/mac/mac_sysv_msg.c
projects/mesh11s/sys/security/mac/mac_sysv_sem.c
projects/mesh11s/sys/security/mac/mac_sysv_shm.c
projects/mesh11s/sys/security/mac/mac_vfs.c
projects/mesh11s/sys/sys/jail.h
projects/mesh11s/sys/sys/ktr.h
projects/mesh11s/sys/sys/osd.h
projects/mesh11s/sys/sys/param.h
projects/mesh11s/sys/sys/priv.h
projects/mesh11s/sys/sys/smp.h
projects/mesh11s/sys/sys/socketvar.h
projects/mesh11s/sys/sys/syscall.h
projects/mesh11s/sys/sys/syscall.mk
projects/mesh11s/sys/sys/syscallsubr.h
projects/mesh11s/sys/sys/sysctl.h
projects/mesh11s/sys/sys/sysproto.h
projects/mesh11s/sys/sys/vimage.h
projects/mesh11s/sys/xen/evtchn.h (props changed)
projects/mesh11s/sys/xen/hypervisor.h (props changed)
projects/mesh11s/sys/xen/xen_intr.h (props changed)
projects/mesh11s/tools/regression/lib/msun/test-conj.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pkill-_g.t (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs.h (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5210.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5211.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5212.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5416.c (props changed)
projects/mesh11s/usr.bin/csup/ (props changed)
projects/mesh11s/usr.bin/du/du.c
projects/mesh11s/usr.bin/ncal/Makefile
projects/mesh11s/usr.bin/ncal/ncal.1
projects/mesh11s/usr.bin/ncal/ncal.c
projects/mesh11s/usr.bin/netstat/inet6.c
projects/mesh11s/usr.bin/procstat/ (props changed)
projects/mesh11s/usr.sbin/dumpcis/cardinfo.h (props changed)
projects/mesh11s/usr.sbin/dumpcis/cis.h (props changed)
projects/mesh11s/usr.sbin/ifmcstat/ifmcstat.c
projects/mesh11s/usr.sbin/jail/jail.c
projects/mesh11s/usr.sbin/makefs/ffs/ffs_bswap.c (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
projects/mesh11s/usr.sbin/makefs/getid.c (props changed)
projects/mesh11s/usr.sbin/mtest/Makefile
projects/mesh11s/usr.sbin/mtest/mtest.8
projects/mesh11s/usr.sbin/mtest/mtest.c
projects/mesh11s/usr.sbin/zic/ (props changed)
Modified: projects/mesh11s/UPDATING
==============================================================================
--- projects/mesh11s/UPDATING Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/UPDATING Sat May 2 18:47:23 2009 (r191750)
@@ -22,6 +22,100 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090430:
+ The layout of the following structs has changed: sysctl_oid,
+ socket, ifnet, inpcbinfo, tcpcb, syncache_head, vnet_inet,
+ vnet_inet6 and vnet_ipfw. Most modules need to be rebuild or
+ panics may be experienced. World rebuild is required for
+ correctly checking networking state from userland.
+ Bump __FreeBSD_version to 800085.
+
+20090429:
+ MLDv2 and Source-Specific Multicast (SSM) have been merged
+ to the IPv6 stack. VIMAGE hooks are in but not yet used.
+ The implementation of SSM within FreeBSD's IPv6 stack closely
+ follows the IPv4 implementation.
+
+ For kernel developers:
+
+ * The most important changes are that the ip6_output() and
+ ip6_input() paths no longer take the IN6_MULTI_LOCK,
+ and this lock has been downgraded to a non-recursive mutex.
+
+ * As with the changes to the IPv4 stack to support SSM, filtering
+ of inbound multicast traffic must now be performed by transport
+ protocols within the IPv6 stack. This does not apply to TCP and
+ SCTP, however, it does apply to UDP in IPv6 and raw IPv6.
+
+ * The KPIs used by IPv6 multicast are similar to those used by
+ the IPv4 stack, with the following differences:
+ * im6o_mc_filter() is analogous to imo_multicast_filter().
+ * The legacy KAME entry points in6_joingroup and in6_leavegroup()
+ are shimmed to in6_mc_join() and in6_mc_leave() respectively.
+ * IN6_LOOKUP_MULTI() has been deprecated and removed.
+ * IPv6 relies on MLD for the DAD mechanism. KAME's internal KPIs
+ for MLDv1 have an additional 'timer' argument which is used to
+ jitter the initial membership report for the solicited-node
+ multicast membership on-link.
+ * This is not strictly needed for MLDv2, which already jitters
+ its report transmissions. However, the 'timer' argument is
+ preserved in case MLDv1 is active on the interface.
+
+ * The KAME linked-list based IPv6 membership implementation has
+ been refactored to use a vector similar to that used by the IPv4
+ stack.
+ Code which maintains a list of its own multicast memberships
+ internally, e.g. carp, has been updated to reflect the new
+ semantics.
+
+ * There is a known Lock Order Reversal (LOR) due to in6_setscope()
+ acquiring the IF_AFDATA_LOCK and being called within ip6_output().
+ Whilst MLDv2 tries to avoid this otherwise benign LOR, it is an
+ implementation constraint which needs to be addressed in HEAD.
+
+ For application developers:
+
+ * The changes are broadly similar to those made for the IPv4
+ stack.
+
+ * The use of IPv4 and IPv6 multicast socket options on the same
+ socket, using mapped addresses, HAS NOT been tested or supported.
+
+ * There are a number of issues with the implementation of various
+ IPv6 multicast APIs which need to be resolved in the API surface
+ before the implementation is fully compatible with KAME userland
+ use, and these are mostly to do with interface index treatment.
+
+ * The literature available discusses the use of either the delta / ASM
+ API with setsockopt(2)/getsockopt(2), or the full-state / ASM API
+ using setsourcefilter(3)/getsourcefilter(3). For more information
+ please refer to RFC 3768, 'Socket Interface Extensions for
+ Multicast Source Filters'.
+
+ * Applications which use the published RFC 3678 APIs should be fine.
+
+ For systems administrators:
+
+ * The mtest(8) utility has been refactored to support IPv6, in
+ addition to IPv4. Interface addresses are no longer accepted
+ as arguments, their names must be used instead. The utility
+ will map the interface name to its first IPv4 address as
+ returned by getifaddrs(3).
+
+ * The ifmcstat(8) utility has also been updated to print the MLDv2
+ endpoint state and source filter lists via sysctl(3).
+
+ * The net.inet6.ip6.mcast.loop sysctl may be tuned to 0 to disable
+ loopback of IPv6 multicast datagrams by default; it defaults to 1
+ to preserve the existing behaviour. Disabling multicast loopback is
+ recommended for optimal system performance.
+
+ * The IPv6 MROUTING code has been changed to examine this sysctl
+ instead of attempting to perform a group lookup before looping
+ back forwarded datagrams.
+
+ Bump __FreeBSD_version to 800084.
+
20090422:
Implement low-level Bluetooth HCI API.
Bump __FreeBSD_version to 800083.
Modified: projects/mesh11s/bin/rm/rm.c
==============================================================================
--- projects/mesh11s/bin/rm/rm.c Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/bin/rm/rm.c Sat May 2 18:47:23 2009 (r191750)
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
int rflag, Iflag;
uid_t uid;
+volatile sig_atomic_t info;
int check(char *, char *, struct stat *);
int check2(char **);
@@ -68,6 +69,7 @@ void checkslash(char **);
void rm_file(char **);
int rm_overwrite(char *, struct stat *);
void rm_tree(char **);
+static void siginfo(int __unused);
void usage(void);
/*
@@ -150,6 +152,7 @@ main(int argc, char *argv[])
checkslash(argv);
uid = geteuid();
+ (void)signal(SIGINFO, siginfo);
if (*argv) {
stdin_ok = isatty(STDIN_FILENO);
@@ -266,6 +269,11 @@ rm_tree(char **argv)
if (rval == 0 && vflag)
(void)printf("%s\n",
p->fts_path);
+ if (rval == 0 && info) {
+ info = 0;
+ (void)printf("%s\n",
+ p->fts_path);
+ }
continue;
}
break;
@@ -276,6 +284,11 @@ rm_tree(char **argv)
if (vflag)
(void)printf("%s\n",
p->fts_path);
+ if (info) {
+ info = 0;
+ (void)printf("%s\n",
+ p->fts_path);
+ }
continue;
}
break;
@@ -297,6 +310,11 @@ rm_tree(char **argv)
if (rval == 0 && vflag)
(void)printf("%s\n",
p->fts_path);
+ if (rval == 0 && info) {
+ info = 0;
+ (void)printf("%s\n",
+ p->fts_path);
+ }
continue;
}
}
@@ -369,6 +387,10 @@ rm_file(char **argv)
}
if (vflag && rval == 0)
(void)printf("%s\n", f);
+ if (info && rval == 0) {
+ info = 0;
+ (void)printf("%s\n", f);
+ }
}
}
@@ -592,3 +614,10 @@ usage(void)
" unlink file");
exit(EX_USAGE);
}
+
+static void
+siginfo(int sig __unused)
+{
+
+ info = 1;
+}
Modified: projects/mesh11s/lib/libc/net/sourcefilter.c
==============================================================================
--- projects/mesh11s/lib/libc/net/sourcefilter.c Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/lib/libc/net/sourcefilter.c Sat May 2 18:47:23 2009 (r191750)
@@ -337,7 +337,7 @@ getsourcefilter(int s, uint32_t interfac
{
struct __msfilterreq msfr;
sockunion_t *psu;
- int err, level, optlen, optname;
+ int err, level, nsrcs, optlen, optname;
if (interface == 0 || group == NULL || numsrc == NULL ||
fmode == NULL) {
@@ -345,6 +345,7 @@ getsourcefilter(int s, uint32_t interfac
return (-1);
}
+ nsrcs = *numsrc;
*numsrc = 0;
*fmode = 0;
@@ -382,7 +383,7 @@ getsourcefilter(int s, uint32_t interfac
memset(&msfr, 0, optlen);
msfr.msfr_ifindex = interface;
msfr.msfr_fmode = 0;
- msfr.msfr_nsrcs = *numsrc;
+ msfr.msfr_nsrcs = nsrcs;
memcpy(&msfr.msfr_group, &psu->ss, psu->ss.ss_len);
/*
Modified: projects/mesh11s/lib/libc/sys/Makefile.inc
==============================================================================
--- projects/mesh11s/lib/libc/sys/Makefile.inc Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/lib/libc/sys/Makefile.inc Sat May 2 18:47:23 2009 (r191750)
@@ -137,7 +137,10 @@ MLINKS+=getsockopt.2 setsockopt.2
MLINKS+=gettimeofday.2 settimeofday.2
MLINKS+=getuid.2 geteuid.2
MLINKS+=intro.2 errno.2
-MLINKS+=jail.2 jail_attach.2
+MLINKS+=jail.2 jail_attach.2 \
+ jail.2 jail_get.2 \
+ jail.2 jail_remove.2 \
+ jail.2 jail_set.2
MLINKS+=kldunload.2 kldunloadf.2
MLINKS+=kqueue.2 kevent.2
MLINKS+=link.2 linkat.2
Modified: projects/mesh11s/lib/libc/sys/Symbol.map
==============================================================================
--- projects/mesh11s/lib/libc/sys/Symbol.map Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/lib/libc/sys/Symbol.map Sat May 2 18:47:23 2009 (r191750)
@@ -344,6 +344,9 @@ FBSD_1.1 {
fexecve;
fstatat;
futimesat;
+ jail_get;
+ jail_set;
+ jail_remove;
linkat;
mkdirat;
mkfifoat;
Modified: projects/mesh11s/lib/libc/sys/jail.2
==============================================================================
--- projects/mesh11s/lib/libc/sys/jail.2 Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/lib/libc/sys/jail.2 Sat May 2 18:47:23 2009 (r191750)
@@ -1,19 +1,40 @@
+.\" Copyright (c) 1999 Poul-Henning Kamp.
+.\" Copyright (c) 2009 James Gritton.
+.\" All rights reserved.
.\"
-.\" ----------------------------------------------------------------------------
-.\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <phk at FreeBSD.ORG> wrote this file. As long as you retain this notice you
-.\" can do whatever you want with this stuff. If we meet some day, and you think
-.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
-.\" ----------------------------------------------------------------------------
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
.\"
.\" $FreeBSD$
.\"
-.Dd January 6, 2009
+.Dd April 29, 2009
.Dt JAIL 2
.Os
.Sh NAME
-.Nm jail , jail_attach
-.Nd imprison current process and future descendants
+.Nm jail ,
+.Nm jail_get ,
+.Nm jail_set ,
+.Nm jail_remove ,
+.Nm jail_attach
+.Nd create and manage system jails
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -23,6 +44,13 @@
.Fn jail "struct jail *jail"
.Ft int
.Fn jail_attach "int jid"
+.Ft int
+.Fn jail_remove "int jid"
+.In sys/uio.h
+.Ft int
+.Fn jail_get "struct iovec *iov" "u_int niov" "int flags"
+.Ft int
+.Fn jail_set "struct iovec *iov" "u_int niov" "int flags"
.Sh DESCRIPTION
The
.Fn jail
@@ -78,20 +106,147 @@ pointers can be set to an arrays of IPv4
the prison, or NULL if none.
IPv4 addresses must be in network byte order.
.Pp
+This is equivalent to the
+.Fn jail_set
+system call (see below), with the parameters
+.Va path ,
+.Va host.hostname ,
+.Va name ,
+.Va ip4.addr ,
+and
+.Va ip6.addr ,
+and with the
+.Dv JAIL_ATTACH
+flag.
+.Pp
+The
+.Fn jail_set
+system call creates a new jail, or modifies an existing one, and optionally
+locks the current process in it.
+Jail parameters are passed as an array of name-value pairs in the array
+.Fa iov ,
+containing
+.Fa niov
+elements.
+Parameter names are a null-terminated string, and values may be strings,
+integers, or other arbitrary data.
+Some parameters are boolean, and do not have a value (their length is zero)
+but are set by the name alone with or without a
+.Dq no
+prefix, e.g.
+.Va persist
+or
+.Va nopersist .
+Any parameters not set will be given default values, generally based on
+the current environment.
+.Pp
+Jails have a set of core parameters, and modules can add their own jail
+parameters.
+The current set of available parameters, and their formats, can be
+retrieved via the
+.Va security.jail.param
+sysctl MIB entry.
+Notable parameters include those mentioned in the
+.Fn jail
+description above, as well as
+.Va jid
+and
+.Va name ,
+which identify the jail being created or modified.
+See
+.Xr jail 8
+for more information on the core jail parameters.
+.Pp
+The
+.Fa flags
+arguments consists of one or more of the following flags:
+.Bl -tag -width indent
+.It Dv JAIL_CREATE
+Create a new jail.
+If a
+.Va jid
+or
+.Va name
+parameters exists, they must not refer to an existing jail.
+.It Dv JAIL_UPDATE
+Modify an existing jail.
+One of the
+.Va jid
+or
+.Va name
+parameters must exist, and must refer to an existing jail.
+If both
+.Dv JAIL_CREATE
+and
+.Dv JAIL_UPDATE
+are set, a jail will be created if it does not yet exist, and modified if it
+does exist.
+.It Dv JAIL_ATTACH
+In addition to creating or modifying the jail, attach the current process to
+it, as with the
+.Fn jail_attach
+system call.
+.It Dv JAIL_DYING
+Allow setting a jail that is in the process of being removed.
+.El
+.Pp
+The
+.Fn jail_get
+system call retrieves jail parameters, using the same name-value list as
+.Fn jail_set
+in the
+.Fa iov
+and
+.Fa niov
+arguments.
+The jail to read can be specified by either
+.Va jid
+or
+.Va name
+by including those parameters in the list.
+If they are included but are not intended to be the search key, they
+should be cleared (zero and the empty string respectively).
+.Pp
+The special parameter
+.Va lastjid
+can be used to retrieve a list of all jails.
+It will fetch the jail with the jid above and closest to the passed value.
+The first jail (usually but not always jid 1) can be found by passing a
+.Va lastjid
+of zero.
+.Pp
+The
+.Fa flags
+arguments consists of one or more following flags:
+.Bl -tag -width indent
+.It Dv JAIL_DYING
+Allow getting a jail that is in the process of being removed.
+.El
+.Pp
The
.Fn jail_attach
system call attaches the current process to an existing jail,
identified by
.Fa jid .
+.Pp
+The
+.Fn jail_remove
+system call removes the jail identified by
+.Fa jid .
+It will kill all processes belonging to the jail, and remove any children
+of that jail.
.Sh RETURN VALUES
If successful,
-.Fn jail
-returns a non-negative integer, termed the jail identifier (JID).
-It returns \-1 on failure, and sets
+.Fn jail ,
+.Fn jail_set ,
+and
+.Fn jail_get
+return a non-negative integer, termed the jail identifier (JID).
+They return \-1 on failure, and set
.Va errno
to indicate the error.
.Pp
-.Rv -std jail_attach
+.Rv -std jail_attach jail_remove
.Sh PRISON?
Once a process has been put in a prison, it and its descendants cannot escape
the prison.
@@ -136,15 +291,111 @@ The
system call
will fail if:
.Bl -tag -width Er
+.It Bq Er EPERM
+This process is not allowed to create a jail.
+.It Bq Er EFAULT
+.Fa jail
+points to an address outside the allocated address space of the process.
.It Bq Er EINVAL
The version number of the argument is not correct.
.It Bq Er EAGAIN
No free JID could be found.
.El
.Pp
+The
+.Fn jail_set
+system call
+will fail if:
+.Bl -tag -width Er
+.It Bq Er EPERM
+This process is not allowed to create a jail.
+.It Bq Er EPERM
+A jail parameter was set to a less restrictive value then the current
+environment.
+.It Bq Er EFAULT
+.Fa Iov ,
+or one of the addresses contained within it,
+points to an address outside the allocated address space of the process.
+.It Bq Er ENOENT
+The jail referred to by a
+.Va jid
+or
+.Va name
+parameter does not exist, and the
+.Dv JAIL_CREATE
+flag is not set.
+.It Bq Er EEXIST
+The jail referred to by a
+.Va jid
+or
+.Va name
+parameter exists, and the
+.Dv JAIL_UPDATE
+flag is not set.
+.It Bq Er EINVAL
+A supplied parameter is the wrong size.
+.It Bq Er EINVAL
+A supplied parameter is out of range.
+.It Bq Er EINVAL
+A supplied string parameter is not null-terminated.
+.It Bq Er EINVAL
+A supplied parameter name does not match any known parameters.
+.It Bq Er EINVAL
+One of the
+.Dv JAIL_CREATE
+or
+.Dv JAIL_UPDATE
+flags is not set.
+.It Bq Er ENAMETOOLONG
+A supplied string parameter is longer than allowed.
+.It Bq Er EAGAIN
+There are no jail IDs left.
+.El
+.Pp
+The
+.Fn jail_get
+system call
+will fail if:
+.Bl -tag -width Er
+.It Bq Er EFAULT
+.Fa Iov ,
+or one of the addresses contained within it,
+points to an address outside the allocated address space of the process.
+.It Bq Er ENOENT
+The jail referred to by a
+.Va jid
+or
+.Va name
+parameter does not exist.
+.It Bq Er ENOENT
+The
+.Va lastjid
+parameter is greater than the highest current jail ID.
+.It Bq Er EINVAL
+A supplied parameter is the wrong size.
+.It Bq Er EINVAL
+A supplied parameter name does not match any known parameters.
+.El
+.Pp
+The
+.Fn jail_attach
+and
+.Fn jail_remove
+system calls
+will fail if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The jail specified by
+.Fa jid
+does not exist.
+.El
+.Pp
Further
-.Fn jail
-calls
+.Fn jail ,
+.Fn jail_set ,
+and
+.Fn jail_attach
+call
.Xr chroot 2
internally, so it can fail for all the same reasons.
Please consult the
@@ -152,7 +403,8 @@ Please consult the
manual page for details.
.Sh SEE ALSO
.Xr chdir 2 ,
-.Xr chroot 2
+.Xr chroot 2 ,
+.Xr jail 8
.Sh HISTORY
The
.Fn jail
@@ -162,6 +414,13 @@ The
.Fn jail_attach
system call appeared in
.Fx 5.1 .
+The
+.Fn jail_set ,
+.Fn jail_get ,
+and
+.Fn jail_remove
+system calls appeared in
+.Fx 8.0 .
.Sh AUTHORS
The jail feature was written by
.An Poul-Henning Kamp
@@ -169,3 +428,5 @@ for R&D Associates
.Dq Li http://www.rndassociates.com/
who contributed it to
.Fx .
+.An James Gritton
+added the extensible jail parameters.
Modified: projects/mesh11s/sbin/geom/class/journal/gjournal.8
==============================================================================
--- projects/mesh11s/sbin/geom/class/journal/gjournal.8 Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/sbin/geom/class/journal/gjournal.8 Sat May 2 18:47:23 2009 (r191750)
@@ -162,7 +162,8 @@ Hardcode provider names in metadata.
Specifies size of the journal if only one provider is used for both data and
journal.
The default is one gigabyte.
-Size should be chosen based on provider's load, and not on its size.
+Size should be chosen based on provider's load, and not on its size;
+recommended minimum is twice the size of the physical memory installed.
It is not recommended to use
.Nm
for small file systems (e.g.: only few gigabytes big).
Modified: projects/mesh11s/sbin/ifconfig/iflagg.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/iflagg.c Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/sbin/ifconfig/iflagg.c Sat May 2 18:47:23 2009 (r191750)
@@ -167,8 +167,7 @@ lagg_status(int s)
for (i = 0; i < (sizeof(lpr) / sizeof(lpr[0])); i++)
printf("\t\tlaggproto %s\n", lpr[i].lpr_name);
}
- } else if (isport)
- printf("\tlagg: laggdev %s\n", rp.rp_ifname);
+ }
}
static struct cmd lagg_cmds[] = {
Modified: projects/mesh11s/sbin/newfs/newfs.8
==============================================================================
--- projects/mesh11s/sbin/newfs/newfs.8 Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/sbin/newfs/newfs.8 Sat May 2 18:47:23 2009 (r191750)
@@ -85,6 +85,9 @@ wear levelling algorithms.
NB: Erasing may take as long time as writing every sector on the disk.
.It Fl J
Enable journaling on the new file system via gjournal.
+See
+.Xr gjournal 8
+for details.
.It Fl L Ar volname
Add a volume label to the new file system.
.It Fl N
@@ -278,6 +281,7 @@ on file systems that contain many small
.Xr dump 8 ,
.Xr dumpfs 8 ,
.Xr fsck 8 ,
+.Xr gjournal 8 ,
.Xr mount 8 ,
.Xr tunefs 8 ,
.Xr gvinum 8
Modified: projects/mesh11s/sbin/tunefs/tunefs.8
==============================================================================
--- projects/mesh11s/sbin/tunefs/tunefs.8 Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/sbin/tunefs/tunefs.8 Sat May 2 18:47:23 2009 (r191750)
@@ -89,7 +89,7 @@ this parameter should be set higher.
.It Fl f Ar avgfilesize
Specify the expected average file size.
.It Fl J Cm enable | disable
-Turn on/off GJournal flag.
+Turn on/off gjournal flag.
.It Fl L Ar volname
Add/modify an optional file system volume label.
.It Fl l Cm enable | disable
@@ -145,6 +145,7 @@ specified mount point.
.Sh SEE ALSO
.Xr fs 5 ,
.Xr dumpfs 8 ,
+.Xr gjournal 8 ,
.Xr newfs 8
.Rs
.%A M. McKusick
Modified: projects/mesh11s/share/man/man4/ng_hole.4
==============================================================================
--- projects/mesh11s/share/man/man4/ng_hole.4 Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/share/man/man4/ng_hole.4 Sat May 2 18:47:23 2009 (r191750)
@@ -58,20 +58,20 @@ as long as the name is unique.
This node type supports the generic control messages, plus the
following:
.Bl -tag -width indent
-.It Dv NGM_BPF_GET_STATS
+.It Dv NGM_HOLE_GET_STATS
This command takes an
.Tn ASCII
string argument, the hook name, and returns the statistics
associated with the hook as a
.Vt "struct ng_hole_hookstat" .
-.It Dv NGM_BPF_CLR_STATS
+.It Dv NGM_HOLE_CLR_STATS
This command takes an
.Tn ASCII
string argument, the hook name, and clears the statistics
associated with the hook.
-.It Dv NGM_BPF_GETCLR_STATS
+.It Dv NGM_HOLE_GETCLR_STATS
This command is identical to
-.Dv NGM_BPF_GET_STATS ,
+.Dv NGM_HOLE_GET_STATS ,
except that the statistics are also atomically cleared.
.El
.Sh SHUTDOWN
Modified: projects/mesh11s/share/man/man4/u3g.4
==============================================================================
--- projects/mesh11s/share/man/man4/u3g.4 Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/share/man/man4/u3g.4 Sat May 2 18:47:23 2009 (r191750)
@@ -66,13 +66,13 @@ Qualcomm Inc. CDMA MSM
.It
Huawei B190, E220 ('<Huawei Mobile>')
.It
-Novatal U740, MC950D, X950D, etc.
+Novatel U740, MC950D, X950D, etc.
.It
Sierra MC875U, MC8775U, etc.
.El
.Pp
(See
-.Pa /sys/dev/u3g.c
+.Pa /sys/dev/usb/serial/u3g.c
for the complete list of supported cards for each vendor
mentioned above.)
.Pp
Modified: projects/mesh11s/share/misc/bsd-family-tree
==============================================================================
--- projects/mesh11s/share/misc/bsd-family-tree Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/share/misc/bsd-family-tree Sat May 2 18:47:23 2009 (r191750)
@@ -227,7 +227,7 @@ FreeBSD 5.2 | |
| | | | | |
| FreeBSD 7.1 | | | |
| | | | | DragonFly 2.2.0
- | V | | | |
+ | V | NetBSD 5.0 OpenBSD 4.5 |
| | | | |
FreeBSD 8 -current | NetBSD -current OpenBSD -current |
| | | | |
@@ -496,6 +496,8 @@ OpenBSD 4.4 2008-11-01 [OBD]
FreeBSD 6.4 2008-11-28 [FBD]
FreeBSD 7.1 2009-01-04 [FBD]
DragonFly 2.2.0 2009-02-17 [DFB]
+NetBSD 5.0 2009-04-29 [NBD]
+OpenBSD 4.5 2009-05-01 [OBD]
Bibliography
------------------------
Modified: projects/mesh11s/sys/amd64/amd64/identcpu.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/identcpu.c Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/sys/amd64/amd64/identcpu.c Sat May 2 18:47:23 2009 (r191750)
@@ -106,9 +106,6 @@ static struct {
{ CENTAUR_VENDOR_ID, CPU_VENDOR_CENTAUR }, /* CentaurHauls */
};
-int cpu_cores;
-int cpu_logical;
-
extern int pq_l2size;
extern int pq_l2nways;
@@ -195,7 +192,6 @@ printcpuinfo(void)
cpu_vendor_id == CPU_VENDOR_CENTAUR) {
printf(" Stepping = %u", cpu_id & 0xf);
if (cpu_high > 0) {
- u_int cmp = 1, htt = 1;
/*
* Here we should probably set up flags indicating
@@ -400,28 +396,6 @@ printcpuinfo(void)
if (tsc_is_invariant)
printf("\n TSC: P-state invariant");
- /*
- * If this CPU supports HTT or CMP then mention the
- * number of physical/logical cores it contains.
- */
- if (cpu_feature & CPUID_HTT)
- htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
- if (cpu_vendor_id == CPU_VENDOR_AMD &&
- (amd_feature2 & AMDID2_CMP))
- cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1;
- else if (cpu_vendor_id == CPU_VENDOR_INTEL &&
- (cpu_high >= 4)) {
- cpuid_count(4, 0, regs);
- if ((regs[0] & 0x1f) != 0)
- cmp = ((regs[0] >> 26) & 0x3f) + 1;
- }
- cpu_cores = cmp;
- cpu_logical = htt / cmp;
- if (cmp > 1)
- printf("\n Cores per package: %d", cmp);
- if ((htt / cmp) > 1)
- printf("\n Logical CPUs per core: %d",
- cpu_logical);
}
}
/* Avoid ugly blank lines: only print newline when we have to. */
Modified: projects/mesh11s/sys/amd64/amd64/local_apic.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/local_apic.c Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/sys/amd64/amd64/local_apic.c Sat May 2 18:47:23 2009 (r191750)
@@ -112,7 +112,7 @@ struct lapic {
u_long la_stat_ticks;
u_long la_prof_ticks;
/* Include IDT_SYSCALL to make indexing easier. */
- u_int la_ioint_irqs[APIC_NUM_IOINTS + 1];
+ int la_ioint_irqs[APIC_NUM_IOINTS + 1];
} static lapics[MAX_APIC_ID + 1];
/* XXX: should thermal be an NMI? */
@@ -254,6 +254,8 @@ lapic_create(u_int apic_id, int boot_cpu
lapics[apic_id].la_lvts[i] = lvts[i];
lapics[apic_id].la_lvts[i].lvt_active = 0;
}
+ for (i = 0; i <= APIC_NUM_IOINTS; i++)
+ lapics[apic_id].la_ioint_irqs[i] = -1;
lapics[apic_id].la_ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL;
lapics[apic_id].la_ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] =
IRQ_TIMER;
@@ -363,11 +365,15 @@ int
lapic_setup_clock(void)
{
u_long value;
+ int i;
/* Can't drive the timer without a local APIC. */
if (lapic == NULL)
return (0);
+ if (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0)
+ return (0);
+
/* Start off with a divisor of 2 (power on reset default). */
lapic_timer_divisor = 2;
@@ -807,7 +813,7 @@ apic_alloc_vector(u_int apic_id, u_int i
*/
mtx_lock_spin(&icu_lock);
for (vector = 0; vector < APIC_NUM_IOINTS; vector++) {
- if (lapics[apic_id].la_ioint_irqs[vector] != 0)
+ if (lapics[apic_id].la_ioint_irqs[vector] != -1)
continue;
lapics[apic_id].la_ioint_irqs[vector] = irq;
mtx_unlock_spin(&icu_lock);
@@ -847,7 +853,7 @@ apic_alloc_vectors(u_int apic_id, u_int
for (vector = 0; vector < APIC_NUM_IOINTS; vector++) {
/* Vector is in use, end run. */
- if (lapics[apic_id].la_ioint_irqs[vector] != 0) {
+ if (lapics[apic_id].la_ioint_irqs[vector] != -1) {
run = 0;
first = 0;
continue;
@@ -932,7 +938,7 @@ apic_free_vector(u_int apic_id, u_int ve
sched_bind(td, apic_cpuid(apic_id));
thread_unlock(td);
mtx_lock_spin(&icu_lock);
- lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0;
+ lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1;
mtx_unlock_spin(&icu_lock);
thread_lock(td);
sched_unbind(td);
@@ -944,11 +950,15 @@ apic_free_vector(u_int apic_id, u_int ve
u_int
apic_idt_to_irq(u_int apic_id, u_int vector)
{
+ int irq;
KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL &&
vector <= APIC_IO_INTS + APIC_NUM_IOINTS,
("Vector %u does not map to an IRQ line", vector));
- return (lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]);
+ irq = lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS];
+ if (irq < 0)
+ irq = 0;
+ return (irq);
}
#ifdef DDB
@@ -974,7 +984,7 @@ DB_SHOW_COMMAND(apic, db_show_apic)
db_printf("Interrupts bound to lapic %u\n", apic_id);
for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) {
irq = lapics[apic_id].la_ioint_irqs[i];
- if (irq == 0 || irq == IRQ_SYSCALL)
+ if (irq == -1 || irq == IRQ_SYSCALL)
continue;
db_printf("vec 0x%2x -> ", i + APIC_IO_INTS);
if (irq == IRQ_TIMER)
Modified: projects/mesh11s/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/mp_machdep.c Sat May 2 18:06:15 2009 (r191749)
+++ projects/mesh11s/sys/amd64/amd64/mp_machdep.c Sat May 2 18:47:23 2009 (r191750)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_extern.h>
#include <machine/apicreg.h>
+#include <machine/clock.h>
#include <machine/cputypes.h>
#include <machine/cpufunc.h>
#include <machine/md_var.h>
@@ -160,6 +161,8 @@ int apic_cpuids[MAX_APIC_ID + 1];
static volatile u_int cpu_ipi_pending[MAXCPU];
static u_int boot_address;
+static int cpu_logical;
+static int cpu_cores;
static void assign_cpu_ids(void);
static void set_interrupt_apic_ids(void);
@@ -181,13 +184,148 @@ mem_range_AP_init(void)
mem_range_softc.mr_op->initAP(&mem_range_softc);
}
-struct cpu_group *
-cpu_topo(void)
+static void
+topo_probe_0xb(void)
{
+ int logical;
+ int p[4];
+ int bits;
+ int type;
+ int cnt;
+ int i;
+ int x;
+
+ /* We only support two levels for now. */
+ for (i = 0; i < 3; i++) {
+ cpuid_count(0x0B, i, p);
+ bits = p[0] & 0x1f;
+ logical = p[1] &= 0xffff;
+ type = (p[2] >> 8) & 0xff;
+ if (type == 0 || logical == 0)
+ break;
+ for (cnt = 0, x = 0; x <= MAX_APIC_ID; x++) {
+ if (!cpu_info[x].cpu_present ||
+ cpu_info[x].cpu_disabled)
+ continue;
+ if (x >> bits == boot_cpu_id >> bits)
+ cnt++;
+ }
+ if (type == CPUID_TYPE_SMT)
+ cpu_logical = cnt;
+ else if (type == CPUID_TYPE_CORE)
+ cpu_cores = cnt;
+ }
+ if (cpu_logical == 0)
+ cpu_logical = 1;
+ cpu_cores /= cpu_logical;
+}
+
+static void
+topo_probe_0x4(void)
+{
+ u_int threads_per_cache, p[4];
+ u_int htt, cmp;
+ int i;
+
+ htt = cmp = 1;
+ /*
+ * If this CPU supports HTT or CMP then mention the
+ * number of physical/logical cores it contains.
+ */
+ if (cpu_feature & CPUID_HTT)
+ htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
+ if (cpu_vendor_id == CPU_VENDOR_AMD && (amd_feature2 & AMDID2_CMP))
+ cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1;
+ else if (cpu_vendor_id == CPU_VENDOR_INTEL && (cpu_high >= 4)) {
+ cpuid_count(4, 0, p);
+ if ((p[0] & 0x1f) != 0)
+ cmp = ((p[0] >> 26) & 0x3f) + 1;
+ }
+ cpu_cores = cmp;
+ cpu_logical = htt / cmp;
+
+ /* Setup the initial logical CPUs info. */
+ if (cpu_feature & CPUID_HTT)
+ logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
+
+ /*
+ * Work out if hyperthreading is *really* enabled. This
+ * is made really ugly by the fact that processors lie: Dual
+ * core processors claim to be hyperthreaded even when they're
+ * not, presumably because they want to be treated the same
+ * way as HTT with respect to per-cpu software licensing.
+ * At the time of writing (May 12, 2005) the only hyperthreaded
+ * cpus are from Intel, and Intel's dual-core processors can be
+ * identified via the "deterministic cache parameters" cpuid
+ * calls.
+ */
+ /*
+ * First determine if this is an Intel processor which claims
+ * to have hyperthreading support.
+ */
+ if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) {
+ /*
+ * If the "deterministic cache parameters" cpuid calls
+ * are available, use them.
+ */
+ if (cpu_high >= 4) {
+ /* Ask the processor about the L1 cache. */
+ for (i = 0; i < 1; i++) {
+ cpuid_count(4, i, p);
+ threads_per_cache = ((p[0] & 0x3ffc000) >> 14) + 1;
+ if (hyperthreading_cpus < threads_per_cache)
+ hyperthreading_cpus = threads_per_cache;
+ if ((p[0] & 0x1f) == 0)
+ break;
+ }
+ }
+
+ /*
+ * If the deterministic cache parameters are not
+ * available, or if no caches were reported to exist,
+ * just accept what the HTT flag indicated.
+ */
+ if (hyperthreading_cpus == 0)
+ hyperthreading_cpus = logical_cpus;
+ }
+}
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list