svn commit: r195447 - in projects/mesh11s: . cddl/contrib/opensolaris contrib/bind9 contrib/cpio contrib/csup contrib/ee contrib/file contrib/gdb contrib/gdtoa contrib/less contrib/libpcap contrib/...

Wed Jul 8 11:39:52 UTC 2009

Author: rpaulo
Date: Wed Jul  8 11:39:50 2009
New Revision: 195447
URL: http://svn.freebsd.org/changeset/base/195447

Log:
  MFC 195323:195446

Added:
  projects/mesh11s/tools/regression/usr.bin/jot/regress.dddd.out
     - copied unchanged from r195446, head/tools/regression/usr.bin/jot/regress.dddd.out
Modified:
  projects/mesh11s/   (props changed)
  projects/mesh11s/MAINTAINERS
  projects/mesh11s/cddl/contrib/opensolaris/   (props changed)
  projects/mesh11s/contrib/bind9/   (props changed)
  projects/mesh11s/contrib/cpio/   (props changed)
  projects/mesh11s/contrib/csup/   (props changed)
  projects/mesh11s/contrib/ee/   (props changed)
  projects/mesh11s/contrib/file/   (props changed)
  projects/mesh11s/contrib/gdb/   (props changed)
  projects/mesh11s/contrib/gdtoa/   (props changed)
  projects/mesh11s/contrib/less/   (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/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/execve.2
  projects/mesh11s/lib/libthr/thread/thr_rtld.c
  projects/mesh11s/lib/libthr/thread/thr_rwlock.c
  projects/mesh11s/lib/libusb/   (props changed)
  projects/mesh11s/lib/libusb/libusb20.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/ipfw/   (props changed)
  projects/mesh11s/share/man/man4/acpi_hp.4
  projects/mesh11s/share/man/man4/acpi_wmi.4
  projects/mesh11s/share/man/man4/pcm.4
  projects/mesh11s/share/zoneinfo/   (props changed)
  projects/mesh11s/sys/   (props changed)
  projects/mesh11s/sys/amd64/amd64/io_apic.c
  projects/mesh11s/sys/amd64/amd64/machdep.c
  projects/mesh11s/sys/amd64/amd64/msi.c
  projects/mesh11s/sys/amd64/amd64/pmap.c
  projects/mesh11s/sys/amd64/include/param.h
  projects/mesh11s/sys/amd64/include/xen/   (props changed)
  projects/mesh11s/sys/arm/include/param.h
  projects/mesh11s/sys/cddl/contrib/opensolaris/   (props changed)
  projects/mesh11s/sys/conf/files
  projects/mesh11s/sys/conf/newvers.sh
  projects/mesh11s/sys/contrib/dev/acpica/   (props changed)
  projects/mesh11s/sys/contrib/pf/   (props changed)
  projects/mesh11s/sys/dev/acpi_support/acpi_hp.c
  projects/mesh11s/sys/dev/ata/   (props changed)
  projects/mesh11s/sys/dev/ata/ata-usb.c   (props changed)
  projects/mesh11s/sys/dev/ata/atapi-cd.c
  projects/mesh11s/sys/dev/ata/chipsets/ata-ahci.c
  projects/mesh11s/sys/dev/ata/chipsets/ata-nvidia.c
  projects/mesh11s/sys/dev/ath/ah_osdep.c
  projects/mesh11s/sys/dev/ath/ah_osdep.h
  projects/mesh11s/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  projects/mesh11s/sys/dev/cxgb/   (props changed)
  projects/mesh11s/sys/dev/e1000/e1000_82542.c
  projects/mesh11s/sys/dev/sound/pcm/feeder_rate.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/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_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_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_hid.c   (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_mbuf.c   (props changed)
  projects/mesh11s/sys/dev/usb/usb_mbuf.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_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_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   (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   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_ural.c   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uralreg.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_uralvar.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zyd.c   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zydfw.h   (props changed)
  projects/mesh11s/sys/dev/usb/wlan/if_zydreg.h   (props changed)
  projects/mesh11s/sys/dev/xen/netfront/   (props changed)
  projects/mesh11s/sys/dev/xen/xenpci/   (props changed)
  projects/mesh11s/sys/fs/fifofs/fifo_vnops.c
  projects/mesh11s/sys/geom/geom_dev.c
  projects/mesh11s/sys/geom/part/g_part.c
  projects/mesh11s/sys/geom/part/g_part_if.m
  projects/mesh11s/sys/i386/i386/io_apic.c
  projects/mesh11s/sys/i386/i386/msi.c
  projects/mesh11s/sys/i386/i386/pmap.c
  projects/mesh11s/sys/i386/include/param.h
  projects/mesh11s/sys/i386/xen/pmap.c
  projects/mesh11s/sys/ia64/include/param.h
  projects/mesh11s/sys/kern/subr_param.c
  projects/mesh11s/sys/kern/sys_pipe.c
  projects/mesh11s/sys/kern/tty.c
  projects/mesh11s/sys/kern/tty_pts.c
  projects/mesh11s/sys/kern/uipc_socket.c
  projects/mesh11s/sys/mips/include/param.h
  projects/mesh11s/sys/modules/Makefile
  projects/mesh11s/sys/modules/dtrace/dtnfsclient/   (props changed)
  projects/mesh11s/sys/modules/geom/geom_label/Makefile
  projects/mesh11s/sys/modules/ip6_mroute_mod/   (props changed)
  projects/mesh11s/sys/modules/ipmi/ipmi_linux/   (props changed)
  projects/mesh11s/sys/modules/wlan/Makefile
  projects/mesh11s/sys/net80211/ieee80211_freebsd.h
  projects/mesh11s/sys/net80211/ieee80211_node.c
  projects/mesh11s/sys/net80211/ieee80211_var.h
  projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c   (props changed)
  projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h   (props changed)
  projects/mesh11s/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c   (props changed)
  projects/mesh11s/sys/netinet/ipfw/ip_dummynet.c   (props changed)
  projects/mesh11s/sys/netinet/ipfw/ip_fw2.c   (props changed)
  projects/mesh11s/sys/netinet/ipfw/ip_fw_nat.c   (props changed)
  projects/mesh11s/sys/netinet/ipfw/ip_fw_pfil.c   (props changed)
  projects/mesh11s/sys/netipx/spx_reass.c   (props changed)
  projects/mesh11s/sys/powerpc/include/param.h
  projects/mesh11s/sys/sparc64/include/param.h
  projects/mesh11s/sys/sun4v/include/param.h
  projects/mesh11s/sys/sys/disk.h
  projects/mesh11s/sys/sys/socketvar.h
  projects/mesh11s/sys/tools/sound/feeder_rate_mkfilter.awk
  projects/mesh11s/sys/vm/vm_extern.h
  projects/mesh11s/sys/vm/vm_fault.c
  projects/mesh11s/sys/vm/vm_map.c
  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/jot/regress.sh
  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/tools/tools/nanobsd/nanobsd.sh
  projects/mesh11s/tools/tools/termcap/termcap.pl   (props changed)
  projects/mesh11s/usr.bin/cpio/cmdline.c
  projects/mesh11s/usr.bin/cpio/test/test_owner_parse.c
  projects/mesh11s/usr.bin/csup/   (props changed)
  projects/mesh11s/usr.bin/jot/jot.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/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/pkg_install/add/perform.c
  projects/mesh11s/usr.sbin/ppp/ppp.8.m4
  projects/mesh11s/usr.sbin/sysinstall/dispatch.c
  projects/mesh11s/usr.sbin/sysinstall/install.c
  projects/mesh11s/usr.sbin/sysinstall/menus.c
  projects/mesh11s/usr.sbin/sysinstall/sysinstall.h
  projects/mesh11s/usr.sbin/tzsetup/tzsetup.8
  projects/mesh11s/usr.sbin/tzsetup/tzsetup.c
  projects/mesh11s/usr.sbin/zic/   (props changed)

Modified: projects/mesh11s/MAINTAINERS
==============================================================================

--- projects/mesh11s/MAINTAINERS	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/MAINTAINERS	Wed Jul  8 11:39:50 2009	(r195447)
@@ -111,7 +111,7 @@ truss		alfred	Will be happy to review co
 rpc		alfred	Pre-commit review requested.
 xfs		kan at FreeBSD.org,rodrigc at FreeBSD.org,cattelan at xfs.org
 			Pre-commit review preferred.
-pkg_install	krion	Pre-commit review or approval from portmgr@ requested.
+pkg_install	portmgr	Pre-commit review or approval from portmgr@ requested.
 linux emul	emulation	Please discuss changes here.
 bs{diff,patch}	cperciva	Pre-commit review requested.
 portsnap	cperciva	Pre-commit review requested.
@@ -123,7 +123,6 @@ lib/libsdp		emax	Pre-commit review prefe
 usr.bin/bluetooth	emax	Pre-commit review preferred.
 usr.sbin/bluetooth	emax	Pre-commit review preferred.
 gnu/usr.bin/send-pr	bugmaster	Pre-commit review requested.
-BSD.{local,x11*}.dist	portmgr	Pre-commit review requested, since these files interface with ports.
 ncurses		rafan	Heads-up appreciated, try not to break it.
 
 Following are the entries from the Makefiles, and a few other sources.

Modified: projects/mesh11s/lib/libc/sys/execve.2
==============================================================================
--- projects/mesh11s/lib/libc/sys/execve.2	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/lib/libc/sys/execve.2	Wed Jul  8 11:39:50 2009	(r195447)
@@ -220,13 +220,11 @@ Since execute permission is checked by
 .Fn fexecve ,
 the file descriptor
 .Fa fd
-need not have been
-opened with the
+need not have been opened with the
 .Dv O_EXEC
 flag.
-However, if the file to be executed denies read and write
-permission for the process preparing to do the exec, the only way to
-provide the
+However, if the file to be executed denies read permission for the process
+preparing to do the exec, the only way to provide the
 .Fa fd
 to
 .Fn fexecve
@@ -234,6 +232,7 @@ is to use the
 .Dv O_EXEC
 flag when opening
 .Fa fd .
+Note that the file to be executed can not be open for writing.
 .Sh RETURN VALUES
 As the
 .Fn execve
@@ -277,7 +276,7 @@ The new process file has the appropriate
 permission, but has an invalid magic number in its header.
 .It Bq Er ETXTBSY
 The new process file is a pure procedure (shared text)
-file that is currently open for writing or reading by some process.
+file that is currently open for writing by some process.
 .It Bq Er ENOMEM
 The new process requires more virtual memory than
 is allowed by the imposed maximum

Modified: projects/mesh11s/lib/libthr/thread/thr_rtld.c
==============================================================================
--- projects/mesh11s/lib/libthr/thread/thr_rtld.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/lib/libthr/thread/thr_rtld.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -114,6 +114,7 @@ _thr_rtld_rlock_acquire(void *lock)
 	THR_CRITICAL_ENTER(curthread);
 	while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0)
 		;
+	curthread->rdlock_count++;
 	RESTORE_ERRNO();
 }
 
@@ -148,6 +149,7 @@ _thr_rtld_lock_release(void *lock)
 	
 	state = l->lock.rw_state;
 	if (_thr_rwlock_unlock(&l->lock) == 0) {
+		curthread->rdlock_count--;
 		if ((state & URWLOCK_WRITE_OWNER) == 0) {
 			THR_CRITICAL_LEAVE(curthread);
 		} else {

Modified: projects/mesh11s/lib/libthr/thread/thr_rwlock.c
==============================================================================
--- projects/mesh11s/lib/libthr/thread/thr_rwlock.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/lib/libthr/thread/thr_rwlock.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -177,10 +177,11 @@ rwlock_rdlock_common(pthread_rwlock_t *r
 		/* if interrupted, try to lock it in userland again. */
 		if (_thr_rwlock_tryrdlock(&prwlock->lock, flags) == 0) {
 			ret = 0;
-			curthread->rdlock_count++;
 			break;
 		}
 	}
+	if (ret == 0)
+		curthread->rdlock_count++;
 	return (ret);
 }
 

Modified: projects/mesh11s/share/man/man4/acpi_hp.4
==============================================================================
--- projects/mesh11s/share/man/man4/acpi_hp.4	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/share/man/man4/acpi_hp.4	Wed Jul  8 11:39:50 2009	(r195447)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2009
+.Dd June 30, 2009
 .Dt ACPI_HP 4 i386
 .Os
 .Sh NAME
@@ -92,8 +92,8 @@ WWAN on air status changed to 0 (not on 
 WWAN on air status changed to 1 (on air)
 .El
 .Ss Xr devfs 8 Ss Device
-You can read /dev/hpcmi to see your current BIOS settings. The detail level
-can be adjusted by setting the sysctl 
+You can read /dev/hpcmi to see your current BIOS settings.
+The detail level can be adjusted by setting the sysctl 
 .Va cmi_detail
 as described below.
 .Sh SYSCTL VARIABLES
@@ -166,13 +166,29 @@ Show a list of valid options for the BIO
 .It Li 0x04
 Show additional flags of BIOS setting (ReadOnly etc.)
 .It Li 0x08
-Query highest BIOS entry instance. This is broken on many HP models and
-therefore disabled by default.
+Query highest BIOS entry instance.
+This is broken on many HP models and therefore disabled by default.
 .El
+.It Va dev.acpi_hp.0.verbose
+(read-only)
+Set verbosity level
 .El
 .Pp
 Defaults for these sysctls can be set in
 .Xr sysctl.conf 5 .
+.Sh HARDWARE
+The
+.Nm
+driver has been reported to support the following hardware:
+.Pp
+.Bl -bullet -compact
+.It
+HP Compaq 8510p
+.It
+HP Compaq nx7300
+.El
+.Pp
+It should work on most HP laptops that feature a WMI enabled BIOS.
 .Sh FILES
 .Bl -tag -width ".Pa /dev/hpcmi"
 .It Pa /dev/hpcmi
@@ -248,7 +264,7 @@ The
 driver was written by
 .An Michael Gmelin Aq freebsd at grem.de
 .Pp
-It has been inspired by hp-wmi driver, which implements a subset of these   
+It has been inspired by hp-wmi driver, which implements a subset of these
 features (hotkeys) on Linux.
 .Pp
 .Bl -tag -width indent

Modified: projects/mesh11s/share/man/man4/acpi_wmi.4
==============================================================================
--- projects/mesh11s/share/man/man4/acpi_wmi.4	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/share/man/man4/acpi_wmi.4	Wed Jul  8 11:39:50 2009	(r195447)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2009
+.Dd June 30, 2009
 .Dt ACPI_WMI 4 i386
 .Os
 .Sh NAME
@@ -48,7 +48,8 @@ acpi_wmi_load="YES"
 The
 .Nm
 driver provides an interface for vendor specific WMI implementations 
-(e.g. HP and Acer laptops). It creates /dev/wmistat, which can be read to get
+(e.g. HP and Acer laptops).
+It creates /dev/wmistat, which can be read to get
 information about GUIDs found in the system.
 .Sh FILES
 .Bl -tag -width /dev/wmistat -compact

Modified: projects/mesh11s/share/man/man4/pcm.4
==============================================================================
--- projects/mesh11s/share/man/man4/pcm.4	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/share/man/man4/pcm.4	Wed Jul  8 11:39:50 2009	(r195447)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 23, 2009
+.Dd July 7, 2009
 .Dt SOUND 4
 .Os
 .Sh NAME
@@ -141,6 +141,15 @@ To define default values for the differe
 set the channel to the preferred value using hints, e.g.:
 .Va hint.pcm.0.line Ns = Ns Qq Li 0 .
 This will mute the input channel per default.
+.Ss EQ
+The Parametric Software Equlizer (EQ) enables the use of
+.Dq tone
+controls (bass and treble).
+Commonly used for ear-candy or frequency compensation due to the vast
+difference in hardware quality.
+EQ is disabled by default, but can be enabled with the
+.Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq
+tunable.
 .Ss VCHANs
 Each device can optionally support more playback and recording channels
 than physical hardware provides by using
@@ -151,15 +160,55 @@ or
 options can be configured via the
 .Xr sysctl 8
 interface but can only be manipulated while the device is inactive.
+.Ss VPC
+FreeBSD supports independent and individual volume controls for each active
+application, without touching the master
+.Nm
+volume.
+This is sometimes referred to as Volume Per Channel (VPC).
+The
+.Tn VPC
+feature is enabled by default.
+.Ss Loader Tunables
+The following loader tunables are used to set driver configuration at the
+.Xr loader 8
+prompt before booting the kernel, or they can be stored in
+.Pa /boot/loader.conf
+in order to automatically set them before booting the kernel.
+It is also possible to use
+.Xr kenv 1
+to change these tunables before loading the
+.Nm
+driver.
+The following tunables can not be changed during runtime using
+.Xr sysctl 8 .
+.Bl -tag -width indent
+.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq
+Set to 1 or 0 to explicitly enable (1) or disable (0) the equalizer.
+Requires a driver reload if changed.
+Enabling this will make bass and treble controls appear in mixer applications.
+This tunable is undefined by default.
+Equalizing is disabled by default.
+.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .vpc
+Set to 1 or 0 to explicitly enable (1) or disable (0) the
+.Tn VPC
+feature.
+This tunable is undefined by default.
+.Tn VPC
+is however enabled by default.
+.El
 .Ss Runtime Configuration
 There are a number of
 .Xr sysctl 8
-variables available.
+variables available which can be modified during runtime.
+These values can also be stored in
+.Pa /etc/sysctl.conf
+in order to automatically set them during the boot process.
 .Va hw.snd.*
-tunables are global settings and
+are global settings and
 .Va dev.pcm.*
 are device specific.
-.Bl -tag -width ".Va hw.snd.report_soft_formats" -offset indent
+.Bl -tag -width indent
 .It Va hw.snd.compat_linux_mmap
 Enable to allow PROT_EXEC page mappings.
 All Linux applications using sound and
@@ -188,19 +237,13 @@ rates.
 Maximum allowable sample rate.
 .It Va hw.snd.feeder_rate_min
 Minimum allowable sample rate.
-.It Va hw.snd.feeder_rate_round
-Sample rate rounding threshold, to avoid large prime division at the
-cost of accuracy.
-All requested sample rates will be rounded to the nearest threshold value.
-Possible values range between 0 (disabled) and 500.
-Default is 25.
-.It Va hw.snd.feeder_polyphase_max
+.It Va hw.snd.feeder_rate_polyphase_max
 Adjust to set the maximum number of allowed polyphase entries during the
 process of building resampling filters.
 Only applicable when the SINC interpolator is used.
 Default value is 183040.
 Set to 0 to disable polyphase resampling.
-.It Va hw.snd.feeder_quality
+.It Va hw.snd.feeder_rate_quality
 Sample rate converter quality.
 Default value is 1, linear interpolation.
 Available options include:
@@ -228,6 +271,12 @@ taps and 90% bandwidth as quality values
 Continuation of the bandlimited SINC inteprolator, with 100dB stopband, 164
 taps and 97% bandwidth as quality values.
 .El
+.It Va hw.snd.feeder_rate_round
+Sample rate rounding threshold, to avoid large prime division at the
+cost of accuracy.
+All requested sample rates will be rounded to the nearest threshold value.
+Possible values range between 0 (disabled) and 500.
+Default is 25.
 .It Va hw.snd.latency
 Configure the buffering latency.
 Only affects applications that do not explicitly request
@@ -299,7 +348,9 @@ This means that any changes to the volum
 Enabling this will preserve the volume, at the cost of possible confusion
 when applications tries to re-open the same device.
 .It Va hw.snd.vpc_mixer_bypass
-The recommended way to use the vpc feature is to teach applications to use
+The recommended way to use the
+.Tn VPC
+feature is to teach applications to use
 the correct
 .Fn ioctl :
 .Dv SNDCTL_DSP_GETPLAYVOL, SNDCTL_DSP_SETPLAYVOL,

Modified: projects/mesh11s/sys/amd64/amd64/io_apic.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/io_apic.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/amd64/amd64/io_apic.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -327,7 +327,7 @@ ioapic_assign_cpu(struct intsrc *isrc, u
 {
 	struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc;
 	struct ioapic *io = (struct ioapic *)isrc->is_pic;
-	u_int old_vector;
+	u_int old_vector, new_vector;
 	u_int old_id;
 
 	/*
@@ -348,11 +348,14 @@ ioapic_assign_cpu(struct intsrc *isrc, u
 	 * Allocate an APIC vector for this interrupt pin.  Once
 	 * we have a vector we program the interrupt pin.
 	 */
-	intpin->io_cpu = apic_id;
-	intpin->io_vector = apic_alloc_vector(apic_id, intpin->io_irq);
-	if (intpin->io_vector == 0)
+	new_vector = apic_alloc_vector(apic_id, intpin->io_irq);
+	if (new_vector == 0)
 		return (ENOSPC);
 
+	intpin->io_cpu = apic_id;
+	intpin->io_vector = new_vector;
+	if (isrc->is_handlers > 0)
+		apic_enable_vector(intpin->io_cpu, intpin->io_vector);
 	if (bootverbose) {
 		printf("ioapic%u: routing intpin %u (", io->io_id,
 		    intpin->io_intpin);
@@ -365,8 +368,11 @@ ioapic_assign_cpu(struct intsrc *isrc, u
 	 * Free the old vector after the new one is established.  This is done
 	 * to prevent races where we could miss an interrupt.
 	 */
-	if (old_vector)
+	if (old_vector) {
+		if (isrc->is_handlers > 0)
+			apic_disable_vector(old_id, old_vector);
 		apic_free_vector(old_id, old_vector, intpin->io_irq);
+	}
 	return (0);
 }
 

Modified: projects/mesh11s/sys/amd64/amd64/machdep.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/machdep.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/amd64/amd64/machdep.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -100,8 +100,9 @@ __FBSDID("$FreeBSD$");
 #ifndef KDB
 #error KDB must be enabled in order for DDB to work!
 #endif
-#endif
 #include <ddb/ddb.h>
+#include <ddb/db_sym.h>
+#endif
 
 #include <net/netisr.h>
 
@@ -1083,6 +1084,30 @@ extern inthand_t
 	IDTVEC(xmm), IDTVEC(dblfault),
 	IDTVEC(fast_syscall), IDTVEC(fast_syscall32);
 
+#ifdef DDB
+/*
+ * Display the index and function name of any IDT entries that don't use
+ * the default 'rsvd' entry point.
+ */
+DB_SHOW_COMMAND(idt, db_show_idt)
+{
+	struct gate_descriptor *ip;
+	int idx;
+	uintptr_t func;
+
+	ip = idt;
+	for (idx = 0; idx < NIDT && !db_pager_quit; idx++) {
+		func = ((long)ip->gd_hioffset << 16 | ip->gd_looffset);
+		if (func != (uintptr_t)&IDTVEC(rsvd)) {
+			db_printf("%3d\t", idx);
+			db_printsym(func, DB_STGY_PROC);
+			db_printf("\n");
+		}
+		ip++;
+	}
+}
+#endif
+
 void
 sdtossd(sd, ssd)
 	struct user_segment_descriptor *sd;

Modified: projects/mesh11s/sys/amd64/amd64/msi.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/msi.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/amd64/amd64/msi.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -230,6 +230,8 @@ msi_assign_cpu(struct intsrc *isrc, u_in
 
 	msi->msi_cpu = apic_id;
 	msi->msi_vector = vector;
+	if (msi->msi_intsrc.is_handlers > 0)
+		apic_enable_vector(msi->msi_cpu, msi->msi_vector);
 	if (bootverbose)
 		printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n",
 		    msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq,
@@ -238,6 +240,8 @@ msi_assign_cpu(struct intsrc *isrc, u_in
 		sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]);
 		sib->msi_cpu = apic_id;
 		sib->msi_vector = vector + i;
+		if (sib->msi_intsrc.is_handlers > 0)
+			apic_enable_vector(sib->msi_cpu, sib->msi_vector);
 		if (bootverbose)
 			printf(
 		    "msi: Assigning MSI IRQ %d to local APIC %u vector %u\n",
@@ -249,9 +253,15 @@ msi_assign_cpu(struct intsrc *isrc, u_in
 	 * Free the old vector after the new one is established.  This is done
 	 * to prevent races where we could miss an interrupt.
 	 */
+	if (msi->msi_intsrc.is_handlers > 0)
+		apic_disable_vector(old_id, old_vector);
 	apic_free_vector(old_id, old_vector, msi->msi_irq);
-	for (i = 1; i < msi->msi_count; i++)
+	for (i = 1; i < msi->msi_count; i++) {
+		sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]);
+		if (sib->msi_intsrc.is_handlers > 0)
+			apic_disable_vector(old_id, old_vector + i);
 		apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]);
+	}
 	return (0);
 }
 

Modified: projects/mesh11s/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/mesh11s/sys/amd64/amd64/pmap.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/amd64/amd64/pmap.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -2218,11 +2218,19 @@ pmap_demote_pde(pmap_t pmap, pd_entry_t 
 		/*
 		 * Invalidate the 2MB page mapping and return "failure" if the
 		 * mapping was never accessed or the allocation of the new
-		 * page table page fails.
+		 * page table page fails.  If the 2MB page mapping belongs to
+		 * the direct map region of the kernel's address space, then
+		 * the page allocation request specifies the highest possible
+		 * priority (VM_ALLOC_INTERRUPT).  Otherwise, the priority is
+		 * normal.  Page table pages are preallocated for every other
+		 * part of the kernel address space, so the direct map region
+		 * is the only part of the kernel address space that must be
+		 * handled here.
 		 */
 		if ((oldpde & PG_A) == 0 || (mpte = vm_page_alloc(NULL,
-		    pmap_pde_pindex(va), VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL |
-		    VM_ALLOC_WIRED)) == NULL) {
+		    pmap_pde_pindex(va), (va >= DMAP_MIN_ADDRESS && va <
+		    DMAP_MAX_ADDRESS ? VM_ALLOC_INTERRUPT : VM_ALLOC_NORMAL) |
+		    VM_ALLOC_NOOBJ | VM_ALLOC_WIRED)) == NULL) {
 			free = NULL;
 			pmap_remove_pde(pmap, pde, trunc_2mpage(va), &free);
 			pmap_invalidate_page(pmap, trunc_2mpage(va));

Modified: projects/mesh11s/sys/amd64/include/param.h
==============================================================================
--- projects/mesh11s/sys/amd64/include/param.h	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/amd64/include/param.h	Wed Jul  8 11:39:50 2009	(r195447)
@@ -47,12 +47,6 @@
  * Round p (pointer or byte index) up to a correctly-aligned value
  * for all data types (int, long, ...).   The result is u_long and
  * must be cast to any desired pointer type.
- *
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits). 
- *
  */
 #ifndef _ALIGNBYTES
 #define	_ALIGNBYTES	(sizeof(long) - 1)
@@ -60,9 +54,6 @@
 #ifndef _ALIGN
 #define	_ALIGN(p)	(((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
 #endif
-#ifndef _ALIGNED_POINTER
-#define	_ALIGNED_POINTER(p,t)	((((u_long)(p)) & (sizeof(t)-1)) == 0)
-#endif
 
 #ifndef _NO_NAMESPACE_POLLUTION
 
@@ -87,7 +78,13 @@
 
 #define	ALIGNBYTES		_ALIGNBYTES
 #define	ALIGN(p)		_ALIGN(p)
-#define	ALIGNED_POINTER(p,t)	_ALIGNED_POINTER(p,t)
+/*
+ * ALIGNED_POINTER is a boolean macro that checks whether an address
+ * is valid to fetch data elements of type t from on this architecture.
+ * This does not reflect the optimal alignment, just the possibility
+ * (within reasonable limits). 
+ */
+#define	ALIGNED_POINTER(p, t)	1
 
 /*
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an

Modified: projects/mesh11s/sys/arm/include/param.h
==============================================================================
--- projects/mesh11s/sys/arm/include/param.h	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/arm/include/param.h	Wed Jul  8 11:39:50 2009	(r195447)
@@ -80,6 +80,13 @@
 
 #define	ALIGNBYTES	_ALIGNBYTES
 #define	ALIGN(p)	_ALIGN(p)
+/*
+ * ALIGNED_POINTER is a boolean macro that checks whether an address
+ * is valid to fetch data elements of type t from on this architecture.
+ * This does not reflect the optimal alignment, just the possibility
+ * (within reasonable limits). 
+ */
+#define	ALIGNED_POINTER(p, t)	((((unsigned)(p)) & (sizeof(t)-1)) == 0)
 
 /*
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an

Modified: projects/mesh11s/sys/conf/files
==============================================================================
--- projects/mesh11s/sys/conf/files	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/conf/files	Wed Jul  8 11:39:50 2009	(r195447)
@@ -498,7 +498,8 @@ dev/ata/ata-cbus.c		optional ata pc98 | 
 dev/ata/ata-isa.c		optional ata isa | ataisa
 dev/ata/ata-pci.c		optional ata pci | atapci
 dev/ata/chipsets/ata-ahci.c	optional ata pci | ataahci | ataacerlabs | \
-					 ataati | ataintel | atajmicron | atavia
+					 ataati | ataintel | atajmicron | \
+					 atavia | atanvidia
 dev/ata/chipsets/ata-acard.c	optional ata pci | ataacard
 dev/ata/chipsets/ata-acerlabs.c	optional ata pci | ataacerlabs
 dev/ata/chipsets/ata-adaptec.c	optional ata pci | ataadaptec
@@ -2231,6 +2232,7 @@ net/zlib.c			optional crypto | geom_uzip
 net80211/ieee80211.c		optional wlan
 net80211/ieee80211_acl.c	optional wlan wlan_acl
 net80211/ieee80211_action.c	optional wlan
+net80211/ieee80211_ageq.c	optional wlan
 net80211/ieee80211_adhoc.c	optional wlan
 net80211/ieee80211_ageq.c	optional wlan
 net80211/ieee80211_amrr.c	optional wlan wlan_amrr

Modified: projects/mesh11s/sys/conf/newvers.sh
==============================================================================
--- projects/mesh11s/sys/conf/newvers.sh	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/conf/newvers.sh	Wed Jul  8 11:39:50 2009	(r195447)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="8.0"
-BRANCH="CURRENT"
+BRANCH="BETA1"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: projects/mesh11s/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- projects/mesh11s/sys/dev/acpi_support/acpi_hp.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/dev/acpi_support/acpi_hp.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -92,6 +92,7 @@ ACPI_MODULE_NAME("HP")
 #define ACPI_HP_METHOD_HDDTEMP				18
 #define ACPI_HP_METHOD_DOCK				19
 #define ACPI_HP_METHOD_CMI_DETAIL			20
+#define ACPI_HP_METHOD_VERBOSE				21
 
 #define HP_MASK_WWAN_ON_AIR			0x1000000
 #define HP_MASK_BLUETOOTH_ON_AIR		0x10000
@@ -121,6 +122,7 @@ struct acpi_hp_softc {
 	int		has_cmi;		/* CMI GUID found */
 	int		cmi_detail;		/* CMI detail level
 						   (set by sysctl) */
+	int		verbose;		/* add debug output */
 	int		wlan_enable_if_radio_on;	/* set by sysctl */
 	int		wlan_disable_if_radio_off;	/* set by sysctl */
 	int		bluetooth_enable_if_radio_on;	/* set by sysctl */
@@ -275,6 +277,12 @@ static struct {
 				    "(cat /dev/hpcmi)",
 		.access		= CTLTYPE_INT | CTLFLAG_RW
 	},
+	{
+		.name		= "verbose",
+		.method		= ACPI_HP_METHOD_VERBOSE,
+		.description	= "Verbosity level",
+		.access		= CTLTYPE_INT | CTLFLAG_RW
+	},
 
 	{ NULL, 0, NULL, 0 }
 };
@@ -334,10 +342,10 @@ MODULE_DEPEND(acpi_hp, acpi, 1, 1, 1);
 static void	
 acpi_hp_evaluate_auto_on_off(struct acpi_hp_softc *sc)
 {
-	int wireless;
-	int new_wlan_status;
-	int new_bluetooth_status;
-	int new_wwan_status;
+	int	wireless;
+	int	new_wlan_status;
+	int	new_bluetooth_status;
+	int	new_wwan_status;
 
 	wireless = acpi_hp_exec_wmi_command(sc->wmi_dev,
 		    ACPI_HP_WMI_WIRELESS_COMMAND, 0, 0);
@@ -345,7 +353,8 @@ acpi_hp_evaluate_auto_on_off(struct acpi
 	new_bluetooth_status = -1;
 	new_wwan_status = -1;
 
-	device_printf(sc->wmi_dev, "Wireless status is %x\n", wireless);
+	if (sc->verbose)
+		device_printf(sc->wmi_dev, "Wireless status is %x\n", wireless);
 	if (sc->wlan_disable_if_radio_off && !(wireless & HP_MASK_WLAN_RADIO)
 	    &&  (wireless & HP_MASK_WLAN_ENABLED)) {
 		acpi_hp_exec_wmi_command(sc->wmi_dev,
@@ -391,10 +400,11 @@ acpi_hp_evaluate_auto_on_off(struct acpi
 		new_wlan_status = (wireless & HP_MASK_WLAN_ON_AIR);
 		if ((new_wlan_status?1:0) != sc->was_wlan_on_air) {
 			sc->was_wlan_on_air = sc->was_wlan_on_air?0:1;
-			device_printf(sc->wmi_dev,
-			    "WLAN on air changed to %i "
-			    "(new_wlan_status is %i)\n",
-			    sc->was_wlan_on_air, new_wlan_status);
+			if (sc->verbose)
+				device_printf(sc->wmi_dev,
+			    	    "WLAN on air changed to %i "
+			    	    "(new_wlan_status is %i)\n",
+			    	    sc->was_wlan_on_air, new_wlan_status);
 			acpi_UserNotify("HP", sc->handle,
 			    0xc0+sc->was_wlan_on_air);
 		}
@@ -404,9 +414,12 @@ acpi_hp_evaluate_auto_on_off(struct acpi
 		if ((new_bluetooth_status?1:0) != sc->was_bluetooth_on_air) {
 			sc->was_bluetooth_on_air = sc->was_bluetooth_on_air?
 			    0:1;
-			device_printf(sc->wmi_dev, "BLUETOOTH on air changed"
-			    " to %i (new_bluetooth_status is %i)\n",
-			    sc->was_bluetooth_on_air, new_bluetooth_status);
+			if (sc->verbose)
+				device_printf(sc->wmi_dev,
+				    "BLUETOOTH on air changed"
+				    " to %i (new_bluetooth_status is %i)\n",
+				    sc->was_bluetooth_on_air,
+				    new_bluetooth_status);
 			acpi_UserNotify("HP", sc->handle,
 			    0xd0+sc->was_bluetooth_on_air);
 		}
@@ -415,9 +428,11 @@ acpi_hp_evaluate_auto_on_off(struct acpi
 		new_wwan_status = (wireless & HP_MASK_WWAN_ON_AIR);
 		if ((new_wwan_status?1:0) != sc->was_wwan_on_air) {
 			sc->was_wwan_on_air = sc->was_wwan_on_air?0:1;
-			device_printf(sc->wmi_dev, "WWAN on air changed to %i"
-			    " (new_wwan_status is %i)\n",
-			    sc->was_wwan_on_air, new_wwan_status);
+			if (sc->verbose)
+				device_printf(sc->wmi_dev,
+				    "WWAN on air changed to %i"
+			    	    " (new_wwan_status is %i)\n",
+				    sc->was_wwan_on_air, new_wwan_status);
 			acpi_UserNotify("HP", sc->handle,
 			    0xe0+sc->was_wwan_on_air);
 		}
@@ -440,7 +455,7 @@ acpi_hp_attach(device_t dev)
 	struct acpi_hp_softc	*sc;
 	struct acpi_softc	*acpi_sc;
 	devclass_t		wmi_devclass;
-	int arg;
+	int			arg;
 
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
 
@@ -460,6 +475,7 @@ acpi_hp_attach(device_t dev)
 	sc->was_wwan_on_air = 0;
 	sc->cmi_detail = 0;
 	sc->cmi_order_size = -1;
+	sc->verbose = 0;
 	memset(sc->cmi_order, 0, sizeof(sc->cmi_order));
 	acpi_sc = acpi_device_get_parent_softc(dev);
 
@@ -553,7 +569,7 @@ acpi_hp_attach(device_t dev)
 static int
 acpi_hp_detach(device_t dev)
 {
-	int ret;
+	int	ret;
 	
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
 	struct acpi_hp_softc *sc = device_get_softc(dev);
@@ -580,12 +596,12 @@ acpi_hp_detach(device_t dev)
 static int
 acpi_hp_sysctl(SYSCTL_HANDLER_ARGS)
 {
-	struct acpi_hp_softc *sc;
-	int	arg;
-	int oldarg;
-	int	error = 0;
-	int	function;
-	int	method;
+	struct acpi_hp_softc	*sc;
+	int			arg;
+	int			oldarg;
+	int			error = 0;
+	int			function;
+	int			method;
 	
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
@@ -608,7 +624,7 @@ acpi_hp_sysctl(SYSCTL_HANDLER_ARGS)
 static int
 acpi_hp_sysctl_get(struct acpi_hp_softc *sc, int method)
 {
-	int val = 0;
+	int	val = 0;
 
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 	ACPI_SERIAL_ASSERT(hp);
@@ -696,6 +712,9 @@ acpi_hp_sysctl_get(struct acpi_hp_softc 
 	case ACPI_HP_METHOD_CMI_DETAIL:
 		val = sc->cmi_detail;
 		break;
+	case ACPI_HP_METHOD_VERBOSE:
+		val = sc->verbose;
+		break;
 	}
 
 	return (val);
@@ -707,7 +726,8 @@ acpi_hp_sysctl_set(struct acpi_hp_softc 
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 	ACPI_SERIAL_ASSERT(hp);
 
-	if (method != ACPI_HP_METHOD_CMI_DETAIL)
+	if (method != ACPI_HP_METHOD_CMI_DETAIL &&
+	    method != ACPI_HP_METHOD_VERBOSE)
 		arg = arg?1:0;
 
 	if (arg != oldarg) {
@@ -759,6 +779,9 @@ acpi_hp_sysctl_set(struct acpi_hp_softc 
 			    sc->cmi_order_size = -1;
 			}
 			break;
+		case ACPI_HP_METHOD_VERBOSE:
+			sc->verbose = arg;
+			break;
 		}
 	}
 
@@ -794,15 +817,15 @@ acpi_hp_notify(ACPI_HANDLE h, UINT32 not
 static int
 acpi_hp_exec_wmi_command(device_t wmi_dev, int command, int is_write, int val)
 {
-	UINT32 params[5] = { 0x55434553,
-			     is_write?2:1,
-			     command,
-			     is_write?4:0,
-			     val};
-	UINT32* result;
-	ACPI_OBJECT *obj;
-	ACPI_BUFFER in = { sizeof(params), &params };
-	ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL };
+	UINT32		params[5] = { 0x55434553,
+			    is_write?2:1,
+			    command,
+			    is_write?4:0,
+			    val};
+	UINT32*		result;
+	ACPI_OBJECT	*obj;
+	ACPI_BUFFER	in = { sizeof(params), &params };
+	ACPI_BUFFER	out = { ACPI_ALLOCATE_BUFFER, NULL };
 	int retval;
 	
 	if (ACPI_FAILURE(ACPI_WMI_EVALUATE_CALL(wmi_dev, ACPI_HP_WMI_BIOS_GUID,
@@ -827,7 +850,8 @@ acpi_hp_exec_wmi_command(device_t wmi_de
 
 static __inline char*
 acpi_hp_get_string_from_object(ACPI_OBJECT* obj, char* dst, size_t size) {
-	int length;
+	int	length;
+
 	dst[0] = 0;
 	if (obj->Type == ACPI_TYPE_STRING) {
 		length = obj->String.Length+1;
@@ -847,33 +871,32 @@ acpi_hp_get_string_from_object(ACPI_OBJE
  * The block returned is ACPI_TYPE_PACKAGE which should contain the following
  * elements:
  * Index Meaning
- * 0     Setting Name [string]
- * 1     Value (comma separated, asterisk marks the current value) [string]
- * 2     Path within the bios hierarchy [string]
- * 3     IsReadOnly [int]
- * 4     DisplayInUI [int]
- * 5     RequiresPhysicalPresence [int]
- * 6     Sequence for ordering within the bios settings (absolute) [int]
- * 7     Length of prerequisites array [int]
- * 8     Prerequisite1 [string]
- * 9     Prerequisite2 [string]
- * 10    Prerequisite3 [string]
- * 11    Current value (in case of enum) [string] / Array length [int]
- * 12    Enum length [int] / Array values
- * 13ff  Enum value at index x [string]
+ * 0        Setting Name [string]
+ * 1        Value (comma separated, asterisk marks the current value) [string]
+ * 2        Path within the bios hierarchy [string]
+ * 3        IsReadOnly [int]
+ * 4        DisplayInUI [int]
+ * 5        RequiresPhysicalPresence [int]
+ * 6        Sequence for ordering within the bios settings (absolute) [int]
+ * 7        Length of prerequisites array [int]
+ * 8..8+[7] PrerequisiteN [string]
+ * 9+[7]    Current value (in case of enum) [string] / Array length [int]
+ * 10+[7]   Enum length [int] / Array values
+ * 11+[7]ff Enum value at index x [string]
  */
 static int
 acpi_hp_get_cmi_block(device_t wmi_dev, const char* guid, UINT8 instance,
     char* outbuf, size_t outsize, UINT32* sequence, int detail)
 {
-	ACPI_OBJECT *obj;
-	ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL };
-	int i;
-	int outlen;
-	int size = 255;
-	int has_enums = 0;
-	char string_buffer[size];
-	int enumbase;
+	ACPI_OBJECT	*obj;
+	ACPI_BUFFER	out = { ACPI_ALLOCATE_BUFFER, NULL };
+	int		i;
+	int		outlen;
+	int		size = 255;
+	int		has_enums = 0;
+	int		valuebase = 0;
+	char		string_buffer[size];
+	int		enumbase;
 
 	outlen = 0;
 	outbuf[0] = 0;	
@@ -887,8 +910,13 @@ acpi_hp_get_cmi_block(device_t wmi_dev, 
 		return (-EINVAL);
 	}
 
+	if (obj->Package.Count >= 8 &&
+	    obj->Package.Elements[7].Type == ACPI_TYPE_INTEGER) {
+	    valuebase = 8 + obj->Package.Elements[7].Integer.Value;
+	}
+
 	/* check if this matches our expectations based on limited knowledge */
-	if (obj->Package.Count >= 13 &&
+	if (valuebase > 7 && obj->Package.Count > valuebase + 1 &&
 	    obj->Package.Elements[0].Type == ACPI_TYPE_STRING &&
 	    obj->Package.Elements[1].Type == ACPI_TYPE_STRING &&
 	    obj->Package.Elements[2].Type == ACPI_TYPE_STRING &&
@@ -896,20 +924,12 @@ acpi_hp_get_cmi_block(device_t wmi_dev, 
 	    obj->Package.Elements[4].Type == ACPI_TYPE_INTEGER &&
 	    obj->Package.Elements[5].Type == ACPI_TYPE_INTEGER &&
 	    obj->Package.Elements[6].Type == ACPI_TYPE_INTEGER &&
-	    obj->Package.Elements[7].Type == ACPI_TYPE_INTEGER &&
-	    obj->Package.Elements[8].Type == ACPI_TYPE_STRING &&
-	    obj->Package.Elements[9].Type == ACPI_TYPE_STRING &&
-	    obj->Package.Elements[10].Type == ACPI_TYPE_STRING &&
-	    ((obj->Package.Elements[11].Type == ACPI_TYPE_STRING &&
-	    obj->Package.Elements[12].Type == ACPI_TYPE_INTEGER &&
-	    obj->Package.Count >=
-	    	13+obj->Package.Elements[12].Integer.Value) ||
-	    (obj->Package.Elements[11].Type == ACPI_TYPE_INTEGER &&
-	    obj->Package.Count >=
-	    	12+obj->Package.Elements[11].Integer.Value))
-	    ) {
-		enumbase = obj->Package.Elements[11].Type == ACPI_TYPE_STRING?
-				12:11;
+	    obj->Package.Elements[valuebase].Type == ACPI_TYPE_STRING &&
+	    obj->Package.Elements[valuebase+1].Type == ACPI_TYPE_INTEGER &&
+	    obj->Package.Count > valuebase + 
+	        obj->Package.Elements[valuebase+1].Integer.Value
+	   ) {
+		enumbase = valuebase + 1;
 		if (detail & ACPI_HP_CMI_DETAIL_PATHS) {
 			strlcat(outbuf, acpi_hp_get_string_from_object(
 				&obj->Package.Elements[2], string_buffer, size),
@@ -924,11 +944,10 @@ acpi_hp_get_cmi_block(device_t wmi_dev, 
 		outlen += 43;
 		while (strlen(outbuf) < outlen)
 			strlcat(outbuf, " ", outsize);
-		if (enumbase == 12)
-			strlcat(outbuf, acpi_hp_get_string_from_object(
-					    &obj->Package.Elements[11],
-					    string_buffer, size),
-					outsize);
+		strlcat(outbuf, acpi_hp_get_string_from_object(
+				&obj->Package.Elements[valuebase], string_buffer, 
+				size),
+				outsize);
 		outlen += 21;
 		while (strlen(outbuf) < outlen)
 			strlcat(outbuf, " ", outsize);
@@ -936,7 +955,7 @@ acpi_hp_get_cmi_block(device_t wmi_dev, 
 			if (outbuf[i] == '\\')
 				outbuf[i] = '/';
 		if (detail & ACPI_HP_CMI_DETAIL_ENUMS) {
-			for (i = enumbase+1; i < enumbase + 1 +
+			for (i = enumbase + 1; i < enumbase + 1 +
 			    obj->Package.Elements[enumbase].Integer.Value;
 			    ++i) {
 				acpi_hp_get_string_from_object(
@@ -980,8 +999,8 @@ acpi_hp_get_cmi_block(device_t wmi_dev, 
  */
 static __inline int acpi_hp_hex_to_int(const UINT8 *hexin, UINT8 *byteout)
 {
-	unsigned int hi;
-	unsigned int lo;
+	unsigned int	hi;
+	unsigned int	lo;
 
 	hi = hexin[0];
 	lo = hexin[1];
@@ -1010,10 +1029,10 @@ static __inline int acpi_hp_hex_to_int(c
 static void
 acpi_hp_hex_decode(char* buffer)
 {
-	int i;
-	int length = strlen(buffer);
-	UINT8 *uin;
-	UINT8 uout;
+	int	i;
+	int	length = strlen(buffer);
+	UINT8	*uin;
+	UINT8	uout;
 
 	if (((int)length/2)*2 == length || length < 10) return;
 
@@ -1044,8 +1063,8 @@ acpi_hp_hex_decode(char* buffer)
 static int
 acpi_hp_hpcmi_open(struct cdev* dev, int flags, int mode, struct thread *td)
 {
-	struct acpi_hp_softc *sc;
-	int ret;
+	struct acpi_hp_softc	*sc;
+	int			ret;
 
 	if (dev == NULL || dev->si_drv1 == NULL)
 		return (EBADF);
@@ -1076,8 +1095,8 @@ acpi_hp_hpcmi_open(struct cdev* dev, int
 static int
 acpi_hp_hpcmi_close(struct cdev* dev, int flags, int mode, struct thread *td)
 {
-	struct acpi_hp_softc *sc;
-	int ret;
+	struct acpi_hp_softc	*sc;
+	int			ret;
 
 	if (dev == NULL || dev->si_drv1 == NULL)
 		return (EBADF);
@@ -1106,13 +1125,13 @@ acpi_hp_hpcmi_close(struct cdev* dev, in
 static int
 acpi_hp_hpcmi_read(struct cdev *dev, struct uio *buf, int flag)
 {
-	struct acpi_hp_softc *sc;
-	int pos, i, l, ret;
-	UINT8 instance;
-	UINT8 maxInstance;
-	UINT32 sequence;
-	int linesize = 1025;
-	char line[linesize];
+	struct acpi_hp_softc	*sc;
+	int			pos, i, l, ret;
+	UINT8			instance;
+	UINT8			maxInstance;
+	UINT32			sequence;
+	int			linesize = 1025;
+	char			line[linesize];
 
 	if (dev == NULL || dev->si_drv1 == NULL)
 		return (EBADF);

Modified: projects/mesh11s/sys/dev/ata/atapi-cd.c
==============================================================================
--- projects/mesh11s/sys/dev/ata/atapi-cd.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/dev/ata/atapi-cd.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -219,10 +219,7 @@ acd_geom_ioctl(struct g_provider *pp, u_
 	case CDIOCRESET:
 	    acd_test_ready(dev);
 	    break;
-
-	case DIOCGPROVIDERALIAS:
-	    break;
-
+	   
 	default:
 	    acd_read_toc(dev);
 	    acd_prevent_allow(dev, 1);

Modified: projects/mesh11s/sys/dev/ata/chipsets/ata-ahci.c
==============================================================================
--- projects/mesh11s/sys/dev/ata/chipsets/ata-ahci.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/dev/ata/chipsets/ata-ahci.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -914,7 +914,7 @@ ata_ahci_dmainit(device_t dev)
     ata_dmainit(dev);
     /* note start and stop are not used here */
     ch->dma.setprd = ata_ahci_dmasetprd;
-    ch->dma.max_iosize = 8192 * DEV_BSIZE;
+    ch->dma.max_iosize = (ATA_AHCI_DMA_ENTRIES - 1) * PAGE_SIZE;
     if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_64BIT)
 	ch->dma.max_address = BUS_SPACE_MAXADDR;
 }

Modified: projects/mesh11s/sys/dev/ata/chipsets/ata-nvidia.c
==============================================================================
--- projects/mesh11s/sys/dev/ata/chipsets/ata-nvidia.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/dev/ata/chipsets/ata-nvidia.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -287,3 +287,4 @@ ata_nvidia_setmode(device_t dev, int mod
 }
 
 ATA_DECLARE_DRIVER(ata_nvidia);
+MODULE_DEPEND(ata_nvidia, ata_ahci, 1, 1, 1);

Modified: projects/mesh11s/sys/dev/ath/ah_osdep.c
==============================================================================
--- projects/mesh11s/sys/dev/ath/ah_osdep.c	Wed Jul  8 11:22:04 2009	(r195446)
+++ projects/mesh11s/sys/dev/ath/ah_osdep.c	Wed Jul  8 11:39:50 2009	(r195447)
@@ -254,7 +254,7 @@ ath_hal_reg_write(struct ath_hal *ah, u_
 		}
 	}
 #if _BYTE_ORDER == _BIG_ENDIAN
-	if (reg >= 0x4000 && reg < 0x5000)
+	if (OS_REG_UNSWAPPED(reg))
 		bus_space_write_4(tag, h, reg, val);
 	else
 #endif
@@ -269,7 +269,7 @@ ath_hal_reg_read(struct ath_hal *ah, u_i
 	u_int32_t val;
 
 #if _BYTE_ORDER == _BIG_ENDIAN
-	if (reg >= 0x4000 && reg < 0x5000)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
