Date: Wed, 24 Jun 2009 16:16:08 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r194852 - in projects/tcp_cc_8.x: . bin/chflags bin/chmod bin/df bin/hostname bin/sh cddl/contrib/opensolaris contrib/bind9 contrib/cpio contrib/csup contrib/ee contrib/file contrib/gdb... Message-ID: <200906241616.n5OGG88e019976@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Wed Jun 24 16:16:07 2009 New Revision: 194852 URL: http://svn.freebsd.org/changeset/base/194852 Log: Merge r194769:194850 from head. Added: projects/tcp_cc_8.x/sys/arm/mv/mv_sata.c - copied unchanged from r194850, head/sys/arm/mv/mv_sata.c projects/tcp_cc_8.x/tools/regression/bin/sh/execution/fork2.0 - copied unchanged from r194850, head/tools/regression/bin/sh/execution/fork2.0 Modified: projects/tcp_cc_8.x/ (props changed) projects/tcp_cc_8.x/bin/chflags/chflags.c projects/tcp_cc_8.x/bin/chmod/chmod.c projects/tcp_cc_8.x/bin/df/df.c projects/tcp_cc_8.x/bin/hostname/hostname.c projects/tcp_cc_8.x/bin/sh/eval.c projects/tcp_cc_8.x/cddl/contrib/opensolaris/ (props changed) projects/tcp_cc_8.x/contrib/bind9/ (props changed) projects/tcp_cc_8.x/contrib/cpio/ (props changed) projects/tcp_cc_8.x/contrib/csup/ (props changed) projects/tcp_cc_8.x/contrib/ee/ (props changed) projects/tcp_cc_8.x/contrib/file/ (props changed) projects/tcp_cc_8.x/contrib/gdb/ (props changed) projects/tcp_cc_8.x/contrib/gdtoa/ (props changed) projects/tcp_cc_8.x/contrib/less/ (props changed) projects/tcp_cc_8.x/contrib/libpcap/ (props changed) projects/tcp_cc_8.x/contrib/ncurses/ (props changed) projects/tcp_cc_8.x/contrib/netcat/ (props changed) projects/tcp_cc_8.x/contrib/ntp/ (props changed) projects/tcp_cc_8.x/contrib/openbsm/ (props changed) projects/tcp_cc_8.x/contrib/openpam/ (props changed) projects/tcp_cc_8.x/contrib/pf/ (props changed) projects/tcp_cc_8.x/contrib/sendmail/ (props changed) projects/tcp_cc_8.x/contrib/tcpdump/ (props changed) projects/tcp_cc_8.x/contrib/top/ (props changed) projects/tcp_cc_8.x/contrib/top/install-sh (props changed) projects/tcp_cc_8.x/contrib/wpa/ (props changed) projects/tcp_cc_8.x/crypto/openssh/ (props changed) projects/tcp_cc_8.x/crypto/openssl/ (props changed) projects/tcp_cc_8.x/include/stdio.h projects/tcp_cc_8.x/lib/libc/ (props changed) projects/tcp_cc_8.x/lib/libc/db/btree/bt_split.c projects/tcp_cc_8.x/lib/libc/db/mpool/mpool.c projects/tcp_cc_8.x/lib/libc/gen/fmtcheck.c projects/tcp_cc_8.x/lib/libc/stdio/asprintf.c (props changed) projects/tcp_cc_8.x/lib/libc/stdtime/ (props changed) projects/tcp_cc_8.x/lib/libc/stdtime/localtime.c projects/tcp_cc_8.x/lib/libc/string/ffsll.c (props changed) projects/tcp_cc_8.x/lib/libc/string/flsll.c (props changed) projects/tcp_cc_8.x/lib/libc/string/wcpcpy.c (props changed) projects/tcp_cc_8.x/lib/libc/string/wcpncpy.c (props changed) projects/tcp_cc_8.x/lib/libcompat/4.3/cfree.c projects/tcp_cc_8.x/lib/libcompat/4.3/regex.c projects/tcp_cc_8.x/lib/libcompat/4.4/cuserid.c projects/tcp_cc_8.x/lib/libusb/ (props changed) projects/tcp_cc_8.x/lib/libusb/libusb20.3 (props changed) projects/tcp_cc_8.x/lib/libusb/usb.h (props changed) projects/tcp_cc_8.x/lib/libutil/ (props changed) projects/tcp_cc_8.x/lib/libutil/humanize_number.c projects/tcp_cc_8.x/lib/libutil/kinfo_getvmmap.3 projects/tcp_cc_8.x/sbin/ (props changed) projects/tcp_cc_8.x/sbin/ifconfig/af_atalk.c projects/tcp_cc_8.x/sbin/ifconfig/af_inet.c projects/tcp_cc_8.x/sbin/ifconfig/af_inet6.c projects/tcp_cc_8.x/sbin/ifconfig/ifclone.c projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.c projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.h projects/tcp_cc_8.x/sbin/ifconfig/ifgif.c projects/tcp_cc_8.x/sbin/ifconfig/ifgre.c projects/tcp_cc_8.x/sbin/ifconfig/ifmac.c projects/tcp_cc_8.x/sbin/ifconfig/ifmedia.c projects/tcp_cc_8.x/sbin/ifconfig/ifvlan.c projects/tcp_cc_8.x/sbin/ipfw/ (props changed) projects/tcp_cc_8.x/sbin/kldload/kldload.8 projects/tcp_cc_8.x/share/man/man4/pcm.4 projects/tcp_cc_8.x/share/man/man9/stack.9 projects/tcp_cc_8.x/share/zoneinfo/ (props changed) projects/tcp_cc_8.x/sys/ (props changed) projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c projects/tcp_cc_8.x/sys/amd64/amd64/mp_machdep.c projects/tcp_cc_8.x/sys/amd64/include/xen/ (props changed) projects/tcp_cc_8.x/sys/amd64/isa/clock.c projects/tcp_cc_8.x/sys/arm/arm/elf_machdep.c projects/tcp_cc_8.x/sys/arm/at91/at91_machdep.c projects/tcp_cc_8.x/sys/arm/conf/DB-78XXX projects/tcp_cc_8.x/sys/arm/conf/DB-88F5XXX projects/tcp_cc_8.x/sys/arm/conf/DB-88F6XXX projects/tcp_cc_8.x/sys/arm/mv/discovery/discovery.c projects/tcp_cc_8.x/sys/arm/mv/files.mv projects/tcp_cc_8.x/sys/arm/mv/kirkwood/kirkwood.c projects/tcp_cc_8.x/sys/arm/mv/mv_machdep.c projects/tcp_cc_8.x/sys/arm/mv/mvreg.h projects/tcp_cc_8.x/sys/arm/mv/orion/orion.c projects/tcp_cc_8.x/sys/arm/sa11x0/assabet_machdep.c projects/tcp_cc_8.x/sys/arm/xscale/i80321/ep80219_machdep.c projects/tcp_cc_8.x/sys/arm/xscale/i80321/iq31244_machdep.c projects/tcp_cc_8.x/sys/arm/xscale/i8134x/crb_machdep.c projects/tcp_cc_8.x/sys/arm/xscale/ixp425/avila_machdep.c projects/tcp_cc_8.x/sys/arm/xscale/pxa/pxa_machdep.c projects/tcp_cc_8.x/sys/cddl/contrib/opensolaris/ (props changed) projects/tcp_cc_8.x/sys/cddl/dev/dtrace/amd64/dtrace_isa.c projects/tcp_cc_8.x/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/tcp_cc_8.x/sys/compat/freebsd32/syscalls.master projects/tcp_cc_8.x/sys/conf/files projects/tcp_cc_8.x/sys/contrib/dev/acpica/ (props changed) projects/tcp_cc_8.x/sys/contrib/ngatm/netnatm/sig/sig_uni.c projects/tcp_cc_8.x/sys/contrib/pf/ (props changed) projects/tcp_cc_8.x/sys/dev/ata/ (props changed) projects/tcp_cc_8.x/sys/dev/ata/ata-all.h projects/tcp_cc_8.x/sys/dev/ata/ata-dma.c projects/tcp_cc_8.x/sys/dev/ata/ata-pci.h projects/tcp_cc_8.x/sys/dev/ata/ata-sata.c projects/tcp_cc_8.x/sys/dev/ata/ata-usb.c (props changed) projects/tcp_cc_8.x/sys/dev/bce/if_bce.c projects/tcp_cc_8.x/sys/dev/bce/if_bcereg.h projects/tcp_cc_8.x/sys/dev/mn/if_mn.c (props changed) projects/tcp_cc_8.x/sys/dev/mxge/if_mxge.c projects/tcp_cc_8.x/sys/dev/sound/pcm/feeder_rate.c projects/tcp_cc_8.x/sys/dev/sound/usb/uaudio.c (props changed) projects/tcp_cc_8.x/sys/dev/sound/usb/uaudio.h (props changed) projects/tcp_cc_8.x/sys/dev/sound/usb/uaudio_pcm.c (props changed) projects/tcp_cc_8.x/sys/dev/sound/usb/uaudioreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/at91dci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/at91dci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/at91dci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/atmegadci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/atmegadci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/atmegadci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci_ixp4xx.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci_mbus.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ehci_pci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/musb_otg.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/musb_otg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/ohci_pci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uhci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uhci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uhci_pci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/usb_controller.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uss820dci.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uss820dci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/uhid.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/ukbd.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/ums.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/input/usb_rdesc.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/misc/udbp.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/misc/udbp.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/misc/ufm.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_aue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_auereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_axe.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_axereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cdce.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cdcereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_cuereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_kue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_kuefw.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_kuereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_rue.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_ruereg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_udav.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/if_udavreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/usb_ethernet.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/net/usb_ethernet.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/quirk/usb_quirk.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/quirk/usb_quirk.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/u3g.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uark.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ubsa.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ubser.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uchcom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ucycom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ufoma.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uftdi.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uftdi_reg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ugensa.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uipaq.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/ulpt.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/umct.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/umodem.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/umoscom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uplcom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/usb_serial.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/usb_serial.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uslcom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uvisor.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/serial/uvscom.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/rio500_usb.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/umass.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/urio.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/storage/ustorage_fs.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template_cdce.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template_msc.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/template/usb_template_mtp.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/ufm_ioctl.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_bus.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_busdma.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_busdma.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_cdc.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_compat_linux.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_compat_linux.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_controller.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_core.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_core.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_debug.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_debug.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dev.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dev.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_device.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_device.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dynamic.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_dynamic.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_endian.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_error.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_generic.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_generic.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_handle_request.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_hid.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_hub.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_hub.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_if.m (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_ioctl.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_lookup.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_mbuf.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_mbuf.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_msctest.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_msctest.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_parse.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_pci.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_process.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_process.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_request.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_request.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_transfer.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_transfer.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_util.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/usb_util.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/usbdevs (props changed) projects/tcp_cc_8.x/sys/dev/usb/usbhid.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rum.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rumfw.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rumreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_rumvar.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_ural.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_uralreg.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_uralvar.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_zyd.c (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_zydfw.h (props changed) projects/tcp_cc_8.x/sys/dev/usb/wlan/if_zydreg.h (props changed) projects/tcp_cc_8.x/sys/dev/xen/netfront/ (props changed) projects/tcp_cc_8.x/sys/dev/xen/xenpci/ (props changed) projects/tcp_cc_8.x/sys/geom/geom_redboot.c projects/tcp_cc_8.x/sys/i386/i386/elf_machdep.c projects/tcp_cc_8.x/sys/i386/i386/machdep.c projects/tcp_cc_8.x/sys/i386/i386/mp_machdep.c projects/tcp_cc_8.x/sys/i386/isa/clock.c projects/tcp_cc_8.x/sys/i386/xen/mp_machdep.c projects/tcp_cc_8.x/sys/ia64/ia64/elf_machdep.c projects/tcp_cc_8.x/sys/ia64/ia64/machdep.c projects/tcp_cc_8.x/sys/ia64/ia64/mp_machdep.c projects/tcp_cc_8.x/sys/kern/kern_cons.c (props changed) projects/tcp_cc_8.x/sys/kern/kern_vimage.c projects/tcp_cc_8.x/sys/kern/link_elf.c projects/tcp_cc_8.x/sys/kern/link_elf_obj.c projects/tcp_cc_8.x/sys/kern/makesyscalls.sh projects/tcp_cc_8.x/sys/kern/sched_ule.c projects/tcp_cc_8.x/sys/kern/subr_pcpu.c projects/tcp_cc_8.x/sys/kern/subr_stack.c projects/tcp_cc_8.x/sys/kern/syscalls.master projects/tcp_cc_8.x/sys/kern/sysv_msg.c projects/tcp_cc_8.x/sys/kern/sysv_sem.c projects/tcp_cc_8.x/sys/kern/sysv_shm.c projects/tcp_cc_8.x/sys/kern/tty.c projects/tcp_cc_8.x/sys/mips/mips/elf_machdep.c projects/tcp_cc_8.x/sys/mips/mips/mp_machdep.c projects/tcp_cc_8.x/sys/mips/mips/pmap.c projects/tcp_cc_8.x/sys/modules/dtrace/dtnfsclient/ (props changed) projects/tcp_cc_8.x/sys/modules/ip6_mroute_mod/ (props changed) projects/tcp_cc_8.x/sys/modules/ipmi/ipmi_linux/ (props changed) projects/tcp_cc_8.x/sys/net/if.c projects/tcp_cc_8.x/sys/net/if_ethersubr.c projects/tcp_cc_8.x/sys/net/if_fddisubr.c projects/tcp_cc_8.x/sys/net/if_spppsubr.c projects/tcp_cc_8.x/sys/net/if_stf.c projects/tcp_cc_8.x/sys/netatalk/aarp.c projects/tcp_cc_8.x/sys/netatalk/at_control.c projects/tcp_cc_8.x/sys/netatalk/at_extern.h projects/tcp_cc_8.x/sys/netatalk/at_rmx.c projects/tcp_cc_8.x/sys/netgraph/atm/uni/ng_uni.c projects/tcp_cc_8.x/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c (props changed) projects/tcp_cc_8.x/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h (props changed) projects/tcp_cc_8.x/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c (props changed) projects/tcp_cc_8.x/sys/netinet/if_ether.c projects/tcp_cc_8.x/sys/netinet/ip_input.c projects/tcp_cc_8.x/sys/netinet/ipfw/ip_dummynet.c (props changed) projects/tcp_cc_8.x/sys/netinet/ipfw/ip_fw2.c (props changed) projects/tcp_cc_8.x/sys/netinet/ipfw/ip_fw_nat.c (props changed) projects/tcp_cc_8.x/sys/netinet/ipfw/ip_fw_pfil.c (props changed) projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c projects/tcp_cc_8.x/sys/netinet6/icmp6.c projects/tcp_cc_8.x/sys/netinet6/in6_pcb.c projects/tcp_cc_8.x/sys/netinet6/in6_pcb.h projects/tcp_cc_8.x/sys/netinet6/in6_src.c projects/tcp_cc_8.x/sys/netinet6/ip6_var.h projects/tcp_cc_8.x/sys/netinet6/nd6_nbr.c projects/tcp_cc_8.x/sys/netinet6/raw_ip6.c projects/tcp_cc_8.x/sys/netinet6/udp6_usrreq.c projects/tcp_cc_8.x/sys/netipx/spx_reass.c (props changed) projects/tcp_cc_8.x/sys/pc98/pc98/machdep.c projects/tcp_cc_8.x/sys/powerpc/aim/mmu_oea.c projects/tcp_cc_8.x/sys/powerpc/aim/mmu_oea64.c projects/tcp_cc_8.x/sys/powerpc/booke/pmap.c projects/tcp_cc_8.x/sys/powerpc/mpc85xx/ds1553_bus_lbc.c projects/tcp_cc_8.x/sys/powerpc/powerpc/elf_machdep.c projects/tcp_cc_8.x/sys/powerpc/powerpc/mp_machdep.c projects/tcp_cc_8.x/sys/security/mac/mac_cred.c (props changed) projects/tcp_cc_8.x/sys/security/mac_bsdextended/ugidfw_system.c (props changed) projects/tcp_cc_8.x/sys/security/mac_bsdextended/ugidfw_vnode.c (props changed) projects/tcp_cc_8.x/sys/sparc64/include/pcpu.h projects/tcp_cc_8.x/sys/sparc64/sparc64/elf_machdep.c projects/tcp_cc_8.x/sys/sparc64/sparc64/machdep.c projects/tcp_cc_8.x/sys/sparc64/sparc64/mp_machdep.c projects/tcp_cc_8.x/sys/sparc64/sparc64/pmap.c projects/tcp_cc_8.x/sys/sun4v/include/pcpu.h projects/tcp_cc_8.x/sys/sun4v/sun4v/machdep.c projects/tcp_cc_8.x/sys/sun4v/sun4v/mp_machdep.c projects/tcp_cc_8.x/sys/sun4v/sun4v/pmap.c projects/tcp_cc_8.x/sys/sys/jail.h projects/tcp_cc_8.x/sys/sys/linker.h projects/tcp_cc_8.x/sys/sys/pcpu.h projects/tcp_cc_8.x/sys/sys/stack.h projects/tcp_cc_8.x/sys/sys/sysctl.h projects/tcp_cc_8.x/sys/sys/tty.h projects/tcp_cc_8.x/sys/vm/swap_pager.c projects/tcp_cc_8.x/sys/vm/vm_object.c projects/tcp_cc_8.x/sys/vm/vm_pageout.c projects/tcp_cc_8.x/tools/regression/lib/msun/test-conj.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs.h (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/tcp_cc_8.x/tools/tools/termcap/termcap.pl (props changed) projects/tcp_cc_8.x/usr.bin/csup/ (props changed) projects/tcp_cc_8.x/usr.bin/hexdump/parse.c projects/tcp_cc_8.x/usr.bin/keylogout/keylogout.c projects/tcp_cc_8.x/usr.bin/make/arch.c projects/tcp_cc_8.x/usr.bin/makewhatis/makewhatis.c projects/tcp_cc_8.x/usr.bin/nfsstat/nfsstat.c projects/tcp_cc_8.x/usr.bin/procstat/ (props changed) projects/tcp_cc_8.x/usr.bin/usbhidctl/usbhid.c projects/tcp_cc_8.x/usr.sbin/dumpcis/cardinfo.h (props changed) projects/tcp_cc_8.x/usr.sbin/dumpcis/cis.h (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/getid.c (props changed) projects/tcp_cc_8.x/usr.sbin/mountd/mountd.c projects/tcp_cc_8.x/usr.sbin/sysinstall/devices.c projects/tcp_cc_8.x/usr.sbin/sysinstall/ufs.c projects/tcp_cc_8.x/usr.sbin/zic/ (props changed) Modified: projects/tcp_cc_8.x/bin/chflags/chflags.c ============================================================================== --- projects/tcp_cc_8.x/bin/chflags/chflags.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/bin/chflags/chflags.c Wed Jun 24 16:16:07 2009 (r194852) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -void usage(void); +static void usage(void); int main(int argc, char *argv[]) @@ -196,7 +196,7 @@ main(int argc, char *argv[]) exit(rval); } -void +static void usage(void) { (void)fprintf(stderr, Modified: projects/tcp_cc_8.x/bin/chmod/chmod.c ============================================================================== --- projects/tcp_cc_8.x/bin/chmod/chmod.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/bin/chmod/chmod.c Wed Jun 24 16:16:07 2009 (r194852) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -void usage(void); +static void usage(void); int main(int argc, char *argv[]) @@ -212,7 +212,7 @@ done: argv += optind; exit(rval); } -void +static void usage(void) { (void)fprintf(stderr, Modified: projects/tcp_cc_8.x/bin/df/df.c ============================================================================== --- projects/tcp_cc_8.x/bin/df/df.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/bin/df/df.c Wed Jun 24 16:16:07 2009 (r194852) @@ -476,7 +476,7 @@ prtstat(struct statfs *sfsp, struct maxw (void)printf("\n"); } -void +static void addstat(struct statfs *totalfsp, struct statfs *statfsp) { uint64_t bsize; Modified: projects/tcp_cc_8.x/bin/hostname/hostname.c ============================================================================== --- projects/tcp_cc_8.x/bin/hostname/hostname.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/bin/hostname/hostname.c Wed Jun 24 16:16:07 2009 (r194852) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -void usage(void); +static void usage(void); int main(int argc, char *argv[]) @@ -96,7 +96,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void usage(void) { Modified: projects/tcp_cc_8.x/bin/sh/eval.c ============================================================================== --- projects/tcp_cc_8.x/bin/sh/eval.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/bin/sh/eval.c Wed Jun 24 16:16:07 2009 (r194852) @@ -401,8 +401,8 @@ evalsubshell(union node *n, int flags) int backgnd = (n->type == NBACKGND); expredir(n->nredir.redirect); - jp = makejob(n, 1); - if (forkshell(jp, n, backgnd) == 0) { + if ((!backgnd && flags & EV_EXIT && !have_traps()) || + forkshell(jp = makejob(n, 1), n, backgnd) == 0) { if (backgnd) flags &=~ EV_TESTED; redirect(n->nredir.redirect, 0); @@ -642,17 +642,32 @@ evalcommand(union node *cmd, int flags, /* Print the command if xflag is set. */ if (xflag) { char sep = 0; + const char *p; out2str(ps4val()); for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) outc(' ', &errout); - out2str(sp->text); + p = sp->text; + while (*p != '=' && *p != '\0') + out2c(*p++); + if (*p != '\0') { + out2c(*p++); + out2qstr(p); + } sep = ' '; } for (sp = arglist.list ; sp ; sp = sp->next) { if (sep != 0) outc(' ', &errout); - out2str(sp->text); + /* Disambiguate command looking like assignment. */ + if (sp == arglist.list && + strchr(sp->text, '=') != NULL && + strchr(sp->text, '\'') == NULL) { + out2c('\''); + out2str(sp->text); + out2c('\''); + } else + out2qstr(sp->text); sep = ' '; } outc('\n', &errout); Modified: projects/tcp_cc_8.x/include/stdio.h ============================================================================== --- projects/tcp_cc_8.x/include/stdio.h Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/include/stdio.h Wed Jun 24 16:16:07 2009 (r194852) @@ -394,7 +394,7 @@ int asprintf(char **, const char *, ... char *ctermid_r(char *); void fcloseall(void); char *fgetln(FILE *, size_t *); -__const char *fmtcheck(const char *, const char *) __format_arg(2); +const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); Modified: projects/tcp_cc_8.x/lib/libc/db/btree/bt_split.c ============================================================================== --- projects/tcp_cc_8.x/lib/libc/db/btree/bt_split.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libc/db/btree/bt_split.c Wed Jun 24 16:16:07 2009 (r194852) @@ -31,7 +31,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94"; +static char sccsid[] = "@(#)bt_split.c 8.10 (Berkeley) 1/9/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -644,8 +644,8 @@ bt_psplit(BTREE *t, PAGE *h, PAGE *l, PA * where we decide to try and copy too much onto the left page. * Make sure that doesn't happen. */ - if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) - || nxt == top - 1) { + if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) || + nxt == top - 1) { --off; break; } Modified: projects/tcp_cc_8.x/lib/libc/db/mpool/mpool.c ============================================================================== --- projects/tcp_cc_8.x/lib/libc/db/mpool/mpool.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libc/db/mpool/mpool.c Wed Jun 24 16:16:07 2009 (r194852) @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94"; +static char sccsid[] = "@(#)mpool.c 8.7 (Berkeley) 11/2/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); Modified: projects/tcp_cc_8.x/lib/libc/gen/fmtcheck.c ============================================================================== --- projects/tcp_cc_8.x/lib/libc/gen/fmtcheck.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libc/gen/fmtcheck.c Wed Jun 24 16:16:07 2009 (r194852) @@ -1,3 +1,5 @@ +/* $NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $ */ + /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -12,13 +14,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -33,7 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $ */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -308,7 +302,7 @@ get_next_format(const char **pf, EFT eft /*NOTREACHED*/ } -__const char * +const char * __fmtcheck(const char *f1, const char *f2) { const char *f1p, *f2p; Modified: projects/tcp_cc_8.x/lib/libc/stdtime/localtime.c ============================================================================== --- projects/tcp_cc_8.x/lib/libc/stdtime/localtime.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libc/stdtime/localtime.c Wed Jun 24 16:16:07 2009 (r194852) @@ -1472,18 +1472,16 @@ struct tm * const tmp; { register struct tm * result; + _MUTEX_LOCK(&gmt_mutex); if (!gmt_is_set) { - _MUTEX_LOCK(&gmt_mutex); - if (!gmt_is_set) { #ifdef ALL_STATE - gmtptr = (struct state *) malloc(sizeof *gmtptr); - if (gmtptr != NULL) + gmtptr = (struct state *) malloc(sizeof *gmtptr); + if (gmtptr != NULL) #endif /* defined ALL_STATE */ - gmtload(gmtptr); - gmt_is_set = TRUE; - } - _MUTEX_UNLOCK(&gmt_mutex); + gmtload(gmtptr); + gmt_is_set = TRUE; } + _MUTEX_UNLOCK(&gmt_mutex); result = timesub(timep, offset, gmtptr, tmp); #ifdef TM_ZONE /* Modified: projects/tcp_cc_8.x/lib/libcompat/4.3/cfree.c ============================================================================== --- projects/tcp_cc_8.x/lib/libcompat/4.3/cfree.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libcompat/4.3/cfree.c Wed Jun 24 16:16:07 2009 (r194852) @@ -37,8 +37,7 @@ static char sccsid[] = "@(#)cfree.c 8.1 #include <stdlib.h> void -cfree(p) - void *p; +cfree(void *p) { free(p); } Modified: projects/tcp_cc_8.x/lib/libcompat/4.3/regex.c ============================================================================== --- projects/tcp_cc_8.x/lib/libcompat/4.3/regex.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libcompat/4.3/regex.c Wed Jun 24 16:16:07 2009 (r194852) @@ -56,8 +56,7 @@ static int re_goterr; static char *re_errstr; char * -re_comp(s) - char *s; +re_comp(char *s) { if (s == NULL || *s == '\0') { if (re_regexp == NULL) @@ -74,8 +73,7 @@ re_comp(s) } int -re_exec(s) - char *s; +re_exec(char *s) { int rc; @@ -85,8 +83,7 @@ re_exec(s) } void -regerror(s) - const char *s; +regerror(const char *s) { re_goterr = 1; if (re_errstr) Modified: projects/tcp_cc_8.x/lib/libcompat/4.4/cuserid.c ============================================================================== --- projects/tcp_cc_8.x/lib/libcompat/4.4/cuserid.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libcompat/4.4/cuserid.c Wed Jun 24 16:16:07 2009 (r194852) @@ -39,8 +39,7 @@ __FBSDID("$FreeBSD$"); #include <unistd.h> char * -cuserid(s) - char *s; +cuserid(char *s) { struct passwd *pwd; Modified: projects/tcp_cc_8.x/lib/libutil/humanize_number.c ============================================================================== --- projects/tcp_cc_8.x/lib/libutil/humanize_number.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libutil/humanize_number.c Wed Jun 24 16:16:07 2009 (r194852) @@ -1,4 +1,4 @@ -/* $NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $ */ +/* $NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc. @@ -16,13 +16,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: projects/tcp_cc_8.x/lib/libutil/kinfo_getvmmap.3 ============================================================================== --- projects/tcp_cc_8.x/lib/libutil/kinfo_getvmmap.3 Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/lib/libutil/kinfo_getvmmap.3 Wed Jun 24 16:16:07 2009 (r194852) @@ -37,9 +37,9 @@ .In sys/types.h .In libutil.h .Ft struct kinfo_vmentry * -.Fn kinfo_getfile "pid_t pid" "int *cntp" +.Fn kinfo_getvmmap "pid_t pid" "int *cntp" .Sh DESCRIPTION -This function is used for obtaining the file descriptor information +This function is used for obtaining virtual memory mapping information of a particular process. .Pp The Modified: projects/tcp_cc_8.x/sbin/ifconfig/af_atalk.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/af_atalk.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/af_atalk.c Wed Jun 24 16:16:07 2009 (r194852) @@ -173,7 +173,7 @@ static __constructor void atalk_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(atalk_cmds); i++) cmd_register(&atalk_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/af_inet.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/af_inet.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/af_inet.c Wed Jun 24 16:16:07 2009 (r194852) @@ -130,7 +130,7 @@ in_getaddr(const char *s, int which) return; if ((hp = gethostbyname(s)) != 0) bcopy(hp->h_addr, (char *)&sin->sin_addr, - MIN(hp->h_length, sizeof(sin->sin_addr))); + MIN((size_t)hp->h_length, sizeof(sin->sin_addr))); else if ((np = getnetbyname(s)) != 0) sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY); else Modified: projects/tcp_cc_8.x/sbin/ifconfig/af_inet6.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/af_inet6.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/af_inet6.c Wed Jun 24 16:16:07 2009 (r194852) @@ -58,12 +58,8 @@ static const char rcsid[] = static struct in6_ifreq in6_ridreq; static struct in6_aliasreq in6_addreq = - { { 0 }, - { 0 }, - { 0 }, - { 0 }, - 0, - { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; + { .ifra_flags = 0, + .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; static int ip6lifetime; static void in6_fillscopeid(struct sockaddr_in6 *sin6); @@ -522,13 +518,13 @@ in6_Lopt_cb(const char *optarg __unused) { ip6lifetime++; /* print IPv6 address lifetime */ } -static struct option in6_Lopt = { "L", "[-L]", in6_Lopt_cb }; +static struct option in6_Lopt = { .opt = "L", .opt_usage = "[-L]", .cb = in6_Lopt_cb }; static __constructor void inet6_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(inet6_cmds); i++) cmd_register(&inet6_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifclone.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifclone.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifclone.c Wed Jun 24 16:16:07 2009 (r194852) @@ -179,13 +179,13 @@ clone_Copt_cb(const char *optarg __unuse list_cloners(); exit(0); } -static struct option clone_Copt = { "C", "[-C]", clone_Copt_cb }; +static struct option clone_Copt = { .opt = "C", .opt_usage = "[-C]", .cb = clone_Copt_cb }; static __constructor void clone_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(clone_cmds); i++) cmd_register(&clone_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.c Wed Jun 24 16:16:07 2009 (r194852) @@ -1053,7 +1053,7 @@ static __constructor void ifconfig_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(basic_cmds); i++) cmd_register(&basic_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.h ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.h Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifconfig.h Wed Jun 24 16:16:07 2009 (r194852) @@ -68,12 +68,12 @@ void callback_register(callback_func *, #define DECL_CMD_FUNC2(name, arg1, arg2) \ void name(const char *arg1, const char *arg2, int s, const struct afswtch *afp) -#define DEF_CMD(name, param, func) { name, param, { .c_func = func } } -#define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func } } -#define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func } } -#define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func } } -#define DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1 } -#define DEF_CLONE_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 1 } +#define DEF_CMD(name, param, func) { name, param, { .c_func = func }, 0, NULL } +#define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 0, NULL } +#define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func }, 0, NULL } +#define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func }, 0, NULL } +#define DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1, NULL } +#define DEF_CLONE_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 1, NULL } struct ifaddrs; struct addrinfo; Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifgif.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifgif.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifgif.c Wed Jun 24 16:16:07 2009 (r194852) @@ -66,7 +66,7 @@ gif_status(int s) { int opts; int nopts = 0; - int i; + size_t i; ifr.ifr_data = (caddr_t)&opts; if (ioctl(s, GIFGOPTS, &ifr) == -1) @@ -123,7 +123,7 @@ static __constructor void gif_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(gif_cmds); i++) cmd_register(&gif_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifgre.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifgre.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifgre.c Wed Jun 24 16:16:07 2009 (r194852) @@ -89,7 +89,7 @@ static __constructor void gre_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(gre_cmds); i++) cmd_register(&gre_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifmac.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifmac.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifmac.c Wed Jun 24 16:16:07 2009 (r194852) @@ -112,7 +112,7 @@ static __constructor void mac_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(mac_cmds); i++) cmd_register(&mac_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifmedia.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifmedia.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifmedia.c Wed Jun 24 16:16:07 2009 (r194852) @@ -330,7 +330,7 @@ setmediainst(const char *val, int d, int ifmr = ifmedia_getstate(s); inst = atoi(val); - if (inst < 0 || inst > IFM_INST_MAX) + if (inst < 0 || inst > (int)IFM_INST_MAX) errx(1, "invalid media instance: %s", val); strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); @@ -822,7 +822,7 @@ static __constructor void ifmedia_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(media_cmds); i++) cmd_register(&media_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/ifconfig/ifvlan.c ============================================================================== --- projects/tcp_cc_8.x/sbin/ifconfig/ifvlan.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/ifconfig/ifvlan.c Wed Jun 24 16:16:07 2009 (r194852) @@ -192,7 +192,7 @@ static __constructor void vlan_ctor(void) { #define N(a) (sizeof(a) / sizeof(a[0])) - int i; + size_t i; for (i = 0; i < N(vlan_cmds); i++) cmd_register(&vlan_cmds[i]); Modified: projects/tcp_cc_8.x/sbin/kldload/kldload.8 ============================================================================== --- projects/tcp_cc_8.x/sbin/kldload/kldload.8 Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sbin/kldload/kldload.8 Wed Jun 24 16:16:07 2009 (r194852) @@ -67,6 +67,11 @@ Be more verbose. .It Fl q Silence any extraneous warnings. .El +.Sh NOTES +.Pp +The kernel security level settings may prevent a module from being +loaded or unloaded by giving +.Em "Operation not permitted" . .Sh FILES .Bl -tag -width /boot/kernel -compact .It Pa /boot/kernel @@ -107,6 +112,7 @@ Modules may also be auto-loaded through .Xr kldload 2 , .Xr loader.conf 5 , .Xr rc.conf 5 , +.Xr security 7 , .Xr kldconfig 8 , .Xr kldstat 8 , .Xr kldunload 8 Modified: projects/tcp_cc_8.x/share/man/man4/pcm.4 ============================================================================== --- projects/tcp_cc_8.x/share/man/man4/pcm.4 Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/share/man/man4/pcm.4 Wed Jun 24 16:16:07 2009 (r194852) @@ -516,8 +516,8 @@ A device node is not created properly. .Xr kldload 8 , .Xr sysctl 8 .Rs -.%T "The OSS API" -.%O "http://www.opensound.com/pguide/oss.pdf" +.%T "Cookbook formulae for audio EQ biquad filter coefficients, by Robert Bristow-Johnson" +.%O "http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt" .Re .Rs .%T "Julius O'Smith's Digital Audio Resampling" @@ -527,6 +527,10 @@ A device node is not created properly. .%T "Polynomial Interpolators for High-Quality Resampling of Oversampled Audio, by Olli Niemitalo" .%O "http://www.student.oulu.fi/~oniemita/dsp/deip.pdf" .Re +.Rs +.%T "The OSS API" +.%O "http://www.opensound.com/pguide/oss.pdf" +.Re .Sh HISTORY The .Nm Modified: projects/tcp_cc_8.x/share/man/man9/stack.9 ============================================================================== --- projects/tcp_cc_8.x/share/man/man9/stack.9 Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/share/man/man9/stack.9 Wed Jun 24 16:16:07 2009 (r194852) @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2007 Robert N. M. Watson +.\" Copyright (c) 2007-2009 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 27, 2007 +.Dd June 24, 2009 .Dt STACK 9 .Os .Sh NAME @@ -54,6 +54,10 @@ In the kernel configuration file: .Ft void .Fn stack_print_ddb "struct stack *st" .Ft void +.Fn stack_print_short "struct stack *st" +.Ft void +.Fn stack_print_short_ddb "struct stack *st" +.Ft void .Fn stack_sbuf_print "struct sbuf sb*" "struct stack *st" .Ft void .Fn stack_sbuf_print_ddb "struct sbuf sb*" "struct stack *st" @@ -84,6 +88,8 @@ A trace of the current kernel thread's c .Fn stack_save . .Pp .Fn stack_print +and +.Fn stack_print_short may be used to print a stack trace using the kernel .Xr printf 9 , and may sleep as a result of acquiring @@ -91,7 +97,9 @@ and may sleep as a result of acquiring locks in the kernel linker while looking up symbol names. In locking-sensitive environments, the unsynchronized .Fn stack_print_ddb -variant may be invoked. +and +.Fn stack_print_short_ddb +variants may be invoked. This function bypasses kernel linker locking, making it usable in .Xr ddb 4 , but not in a live system where linker data structures may change. Modified: projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c ============================================================================== --- projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/amd64/amd64/machdep.c Wed Jun 24 16:16:07 2009 (r194852) @@ -1501,6 +1501,8 @@ hammer_time(u_int64_t modulep, u_int64_t wrmsr(MSR_KGSBASE, 0); /* User value while in the kernel */ pcpu_init(pc, 0, sizeof(struct pcpu)); + dpcpu_init((void *)(physfree + KERNBASE), 0); + physfree += DPCPU_SIZE; PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); Modified: projects/tcp_cc_8.x/sys/amd64/amd64/mp_machdep.c ============================================================================== --- projects/tcp_cc_8.x/sys/amd64/amd64/mp_machdep.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/amd64/amd64/mp_machdep.c Wed Jun 24 16:16:07 2009 (r194852) @@ -93,9 +93,10 @@ static int bootAP; /* Free these after use */ void *bootstacks[MAXCPU]; -/* Temporary holder for double fault stack */ +/* Temporary variables for init_secondary() */ char *doublefault_stack; char *nmi_stack; +void *dpcpu; /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -590,6 +591,7 @@ init_secondary(void) /* prime data page for it to use */ pcpu_init(pc, cpu, sizeof(struct pcpu)); + dpcpu_init(dpcpu, cpu); pc->pc_apic_id = cpu_apic_ids[cpu]; pc->pc_prvspace = pc; pc->pc_curthread = 0; @@ -885,6 +887,7 @@ start_all_aps(void) bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); nmi_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); + dpcpu = (void *)kmem_alloc(kernel_map, DPCPU_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; Modified: projects/tcp_cc_8.x/sys/amd64/isa/clock.c ============================================================================== --- projects/tcp_cc_8.x/sys/amd64/isa/clock.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/amd64/isa/clock.c Wed Jun 24 16:16:07 2009 (r194852) @@ -93,9 +93,6 @@ static int i8254_ticked; static int using_atrtc_timer; static int using_lapic_timer; -static u_int stat_ticks = 0; -static u_int prof_ticks = 0; - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 @@ -132,6 +129,7 @@ int statclockintr(struct trapframe *frame) { + profclockintr(frame); statclock(TRAPF_USERMODE(frame)); return (FILTER_HANDLED); } @@ -140,7 +138,10 @@ int profclockintr(struct trapframe *frame) { - profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + if (!using_atrtc_timer) + hardclockintr(frame); + if (profprocs != 0) + profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); return (FILTER_HANDLED); } @@ -160,32 +161,27 @@ clkintr(struct trapframe *frame) mtx_unlock_spin(&clock_lock); } KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer")); -#ifdef SMP - if (smp_started) - ipi_all_but_self(IPI_HARDCLOCK); -#endif - hardclockintr(frame); - if (!using_atrtc_timer) { - prof_ticks += profhz; - if (prof_ticks >= hz) { - prof_ticks -= hz; - if (profprocs != 0) { + if (using_atrtc_timer) { #ifdef SMP - if (smp_started) - ipi_all_but_self(IPI_PROFCLOCK); + if (smp_started) + ipi_all_but_self(IPI_HARDCLOCK); #endif - profclockintr(frame); - } - } - stat_ticks += stathz; - if (stat_ticks >= hz) { - stat_ticks -= hz; + hardclockintr(frame); + } else { + if (--pscnt <= 0) { + pscnt = psratio; #ifdef SMP if (smp_started) ipi_all_but_self(IPI_STATCLOCK); #endif statclockintr(frame); + } else { +#ifdef SMP + if (smp_started) + ipi_all_but_self(IPI_PROFCLOCK); +#endif + profclockintr(frame); } } @@ -266,21 +262,19 @@ rtcintr(struct trapframe *frame) while (rtcin(RTC_INTR) & RTCIR_PERIOD) { flag = 1; - if (profprocs != 0) { - if (--pscnt == 0) - pscnt = psdiv; + if (--pscnt <= 0) { + pscnt = psdiv; #ifdef SMP - if (pscnt != psdiv && smp_started) - ipi_all_but_self(IPI_PROFCLOCK); + if (smp_started) + ipi_all_but_self(IPI_STATCLOCK); #endif - profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); - } - if (pscnt == psdiv) { + statclockintr(frame); + } else { #ifdef SMP if (smp_started) - ipi_all_but_self(IPI_STATCLOCK); + ipi_all_but_self(IPI_PROFCLOCK); #endif - statclock(TRAPF_USERMODE(frame)); + profclockintr(frame); } } return(flag ? FILTER_HANDLED : FILTER_STRAY); @@ -523,8 +517,11 @@ cpu_initclocks() INTR_TYPE_CLK, NULL); atrtc_enable_intr(); } else { - profhz = min(RTC_PROFRATE, hz); - stathz = min(RTC_NOPROFRATE, hz); + profhz = hz; + if (hz < 128) + stathz = hz; + else + stathz = hz / (hz / 128); } } Modified: projects/tcp_cc_8.x/sys/arm/arm/elf_machdep.c ============================================================================== --- projects/tcp_cc_8.x/sys/arm/arm/elf_machdep.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/arm/elf_machdep.c Wed Jun 24 16:16:07 2009 (r194852) @@ -149,7 +149,7 @@ elf_reloc_internal(linker_file_t lf, Elf if (local) { if (rtype == R_ARM_RELATIVE) { /* A + B */ - addr = relocbase + addend; + addr = elf_relocaddr(lf, relocbase + addend); if (*where != addr) *where = addr; } Modified: projects/tcp_cc_8.x/sys/arm/at91/at91_machdep.c ============================================================================== --- projects/tcp_cc_8.x/sys/arm/at91/at91_machdep.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/at91/at91_machdep.c Wed Jun 24 16:16:07 2009 (r194852) @@ -215,6 +215,7 @@ void * initarm(void *arg, void *arg2) { struct pv_addr kernel_l1pt; + struct pv_addr dpcpu; int loop, i; u_int l1pagetable; vm_offset_t freemempos; @@ -264,6 +265,10 @@ initarm(void *arg, void *arg2) */ valloc_pages(systempage, 1); + /* Allocate dynamic per-cpu area. */ + valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); + dpcpu_init((void *)dpcpu.pv_va, 0); + /* Allocate stacks for all modes */ valloc_pages(irqstack, IRQ_STACK_SIZE); valloc_pages(abtstack, ABT_STACK_SIZE); Modified: projects/tcp_cc_8.x/sys/arm/conf/DB-78XXX ============================================================================== --- projects/tcp_cc_8.x/sys/arm/conf/DB-78XXX Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/conf/DB-78XXX Wed Jun 24 16:16:07 2009 (r194852) @@ -77,3 +77,7 @@ device da device iic device iicbus device ds133x + +# SATA +device ata +device atadisk Modified: projects/tcp_cc_8.x/sys/arm/conf/DB-88F5XXX ============================================================================== --- projects/tcp_cc_8.x/sys/arm/conf/DB-88F5XXX Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/conf/DB-88F5XXX Wed Jun 24 16:16:07 2009 (r194852) @@ -79,3 +79,7 @@ device umass device scbus device pass device da + +# SATA +device ata +device atadisk Modified: projects/tcp_cc_8.x/sys/arm/conf/DB-88F6XXX ============================================================================== --- projects/tcp_cc_8.x/sys/arm/conf/DB-88F6XXX Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/conf/DB-88F6XXX Wed Jun 24 16:16:07 2009 (r194852) @@ -76,3 +76,7 @@ device da # I2C (TWSI) device iic device iicbus + +# SATA +device ata +device atadisk Modified: projects/tcp_cc_8.x/sys/arm/mv/discovery/discovery.c ============================================================================== --- projects/tcp_cc_8.x/sys/arm/mv/discovery/discovery.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/mv/discovery/discovery.c Wed Jun 24 16:16:07 2009 (r194852) @@ -130,6 +130,11 @@ struct obio_device obio_devices[] = { { -1 }, { -1 }, CPU_PM_CTRL_NONE }, + { "sata", MV_SATAHC_BASE, MV_SATAHC_SIZE, + { MV_INT_SATA, -1 }, + { -1 }, + CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1 + }, { NULL, 0, 0, { 0 }, { 0 }, 0 } }; Modified: projects/tcp_cc_8.x/sys/arm/mv/files.mv ============================================================================== --- projects/tcp_cc_8.x/sys/arm/mv/files.mv Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/mv/files.mv Wed Jun 24 16:16:07 2009 (r194852) @@ -24,6 +24,7 @@ arm/mv/gpio.c standard arm/mv/ic.c standard arm/mv/mv_machdep.c standard arm/mv/mv_pci.c optional pci +arm/mv/mv_sata.c optional ata | atamvsata arm/mv/obio.c standard arm/mv/timer.c standard arm/mv/twsi.c optional iicbus Modified: projects/tcp_cc_8.x/sys/arm/mv/kirkwood/kirkwood.c ============================================================================== --- projects/tcp_cc_8.x/sys/arm/mv/kirkwood/kirkwood.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/mv/kirkwood/kirkwood.c Wed Jun 24 16:16:07 2009 (r194852) @@ -99,6 +99,11 @@ struct obio_device obio_devices[] = { { -1 }, { -1 }, CPU_PM_CTRL_NONE }, + { "sata", MV_SATAHC_BASE, MV_SATAHC_SIZE, + { MV_INT_SATA, -1 }, + { -1 }, + CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1 + }, { NULL, 0, 0, { 0 }, { 0 }, 0 } }; Modified: projects/tcp_cc_8.x/sys/arm/mv/mv_machdep.c ============================================================================== --- projects/tcp_cc_8.x/sys/arm/mv/mv_machdep.c Wed Jun 24 16:11:29 2009 (r194851) +++ projects/tcp_cc_8.x/sys/arm/mv/mv_machdep.c Wed Jun 24 16:16:07 2009 (r194852) @@ -358,6 +358,7 @@ void * initarm(void *mdp, void *unused __unused) { struct pv_addr kernel_l1pt; + struct pv_addr dpcpu; vm_offset_t freemempos, l2_start, lastaddr; uint32_t memsize, l2size; struct bi_mem_region *mr; @@ -479,6 +480,10 @@ initarm(void *mdp, void *unused __unused */ valloc_pages(systempage, 1); + /* Allocate dynamic per-cpu area. */ + valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); + dpcpu_init((void *)dpcpu.pv_va, 0); + /* Allocate stacks for all modes */ valloc_pages(irqstack, IRQ_STACK_SIZE); valloc_pages(abtstack, ABT_STACK_SIZE); Copied: projects/tcp_cc_8.x/sys/arm/mv/mv_sata.c (from r194850, head/sys/arm/mv/mv_sata.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/tcp_cc_8.x/sys/arm/mv/mv_sata.c Wed Jun 24 16:16:07 2009 (r194852, copy of r194850, head/sys/arm/mv/mv_sata.c) @@ -0,0 +1,862 @@ +/*- + * Copyright (C) 2008-2009 Semihalf + * All rights reserved. + * + * Initial version developed by Ilya Bakulin. Full functionality and bringup + * by Piotr Ziecik. + * + * 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 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/bus.h> +#include <sys/lock.h> +#include <sys/resource.h> +#include <sys/systm.h> +#include <sys/rman.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/mutex.h> +#include <sys/endian.h> +#include <sys/sema.h> +#include <sys/taskqueue.h> +#include <vm/uma.h> +#include <machine/bus.h> +#include <machine/resource.h> + +#include <sys/ata.h> +#include <dev/ata/ata-all.h> + +#include "ata_if.h" + +#include "mvreg.h" +#include "mvvar.h" + +/* Useful macros */ +#define EDMA_TIMEOUT 100000 /* 100 ms */ +#define SATA_INL(sc, reg) ATA_INL((sc)->sc_mem_res, reg) +#define SATA_OUTL(sc, reg, val) ATA_OUTL((sc)->sc_mem_res, reg, val) + +/* HW-related data structures */ +struct sata_prdentry { + uint32_t prd_addrlo; + uint32_t prd_count; + uint32_t prd_addrhi; + uint32_t prd_reserved; +}; + +struct sata_crqb { + uint32_t crqb_prdlo; + uint32_t crqb_prdhi; + uint32_t crqb_flags; + uint16_t crqb_count; + uint16_t crqb_reserved1[2]; + uint8_t crqb_ata_command; + uint8_t crqb_ata_feature; + uint8_t crqb_ata_lba_low; + uint8_t crqb_ata_lba_mid; + uint8_t crqb_ata_lba_high; + uint8_t crqb_ata_device; + uint8_t crqb_ata_lba_low_p; + uint8_t crqb_ata_lba_mid_p; + uint8_t crqb_ata_lba_high_p; + uint8_t crqb_ata_feature_p; + uint8_t crqb_ata_count; + uint8_t crqb_ata_count_p; + uint16_t crqb_reserved2; +}; + +struct sata_crpb { + uint8_t crpb_tag; + uint8_t crpb_reserved; + uint8_t crpb_edma_status; + uint8_t crpb_dev_status; + uint32_t crpb_timestamp; +}; + +/* Identification section. */ +struct sata_softc { + device_t sc_dev; + unsigned int sc_version; + unsigned int sc_edma_qlen; + uint32_t sc_edma_reqis_mask; + uint32_t sc_edma_resos_mask; + struct resource *sc_mem_res; + bus_space_tag_t sc_mem_res_bustag; + bus_space_handle_t sc_mem_res_bushdl; + struct resource *sc_irq_res; + void *sc_irq_cookiep; + struct { + void (*function)(void *); + void *argument; + } sc_interrupt[SATA_CHAN_NUM]; +}; + +/* Controller functions */ +static int sata_probe(device_t dev); +static int sata_attach(device_t dev); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906241616.n5OGG88e019976>