CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 08:17:30 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: ohci.c

Log Message:
slightly closer, and still working with uaudio.


To generate a diff of this commit:
cvs rdiff -u -r1.218.6.2.2.1 -r1.218.6.2.2.2 src/sys/dev/usb/ohci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 08:52:25 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: ehci.c ohci.c

Log Message:
sync a couple more changes from the main branch, uaudio@ohci still works.


To generate a diff of this commit:
cvs rdiff -u -r1.181.6.2 -r1.181.6.2.2.1 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.218.6.2.2.2 -r1.218.6.2.2.3 src/sys/dev/usb/ohci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 08:56:57 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: uhci.c uhcivar.h

Log Message:
sync with main branch


To generate a diff of this commit:
cvs rdiff -u -r1.240.6.1 -r1.240.6.1.2.1 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.48 -r1.48.14.1 src/sys/dev/usb/uhcivar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 09:09:30 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: ohci.c

Log Message:
partial sync with main branch


To generate a diff of this commit:
cvs rdiff -u -r1.218.6.2.2.3 -r1.218.6.2.2.4 src/sys/dev/usb/ohci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 09:36:49 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: ohci.c usb_subr.c

Log Message:
at little closer to the main branch.


To generate a diff of this commit:
cvs rdiff -u -r1.218.6.2.2.4 -r1.218.6.2.2.5 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.180.6.1 -r1.180.6.1.2.1 src/sys/dev/usb/usb_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 09:54:30 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: usb.c

Log Message:
mostly in sync with the branch here now.


To generate a diff of this commit:
cvs rdiff -u -r1.125.6.1 -r1.125.6.1.2.1 src/sys/dev/usb/usb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 10:22:40 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: ohci.c usb_subr.c usbdi.c
usbdivar.h

Log Message:
merge a few more things from the main branch.  uaudio@ohci still works.


To generate a diff of this commit:
cvs rdiff -u -r1.218.6.2.2.5 -r1.218.6.2.2.6 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.180.6.1.2.1 -r1.180.6.1.2.2 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.134.2.1.2.1 -r1.134.2.1.2.2 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.93.8.1 -r1.93.8.1.2.1 src/sys/dev/usb/usbdivar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 10:41:28 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: usb.c usb_subr.c usbdivar.h
utoppy.c

Log Message:
merge a few more changes from the main branch.


To generate a diff of this commit:
cvs rdiff -u -r1.125.6.1.2.1 -r1.125.6.1.2.2 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.180.6.1.2.2 -r1.180.6.1.2.3 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.93.8.1.2.1 -r1.93.8.1.2.2 src/sys/dev/usb/usbdivar.h
cvs rdiff -u -r1.15 -r1.15.14.1 src/sys/dev/usb/utoppy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/secmodel/keylock

2011-12-08 Thread Jean-Yves Migeon
Module Name:src
Committed By:   jym
Date:   Thu Dec  8 11:01:59 UTC 2011

Modified Files:
src/sys/secmodel/keylock: secmodel_keylock.c

Log Message:
build fix for keylock secmodel(9).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/secmodel/keylock/secmodel_keylock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/x86/x86

2011-12-08 Thread Chuck Silvers
Module Name:src
Committed By:   chs
Date:   Thu Dec  8 15:35:35 UTC 2011

Modified Files:
src/sys/arch/x86/x86: pmap.c

Log Message:
allow building without direct-map support in non-XEN kernels.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/x86/x86/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 20:21:31 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: ohci.c usbdi.c

Log Message:
pull across a few more of the changes from the main branch.


To generate a diff of this commit:
cvs rdiff -u -r1.218.6.2.2.6 -r1.218.6.2.2.7 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.134.2.1.2.2 -r1.134.2.1.2.3 src/sys/dev/usb/usbdi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/hppa

2011-12-08 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Thu Dec  8 21:00:50 UTC 2011

Modified Files:
src/sys/arch/hppa/hppa: hppa_machdep.c
src/sys/arch/hppa/include: mcontext.h

Log Message:
Track if we saved l_private in the mcontext and don't blindly restore it.

This fixes the tests in /usr/tests/lib/libc/setjmp/t_threadjmp


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hppa/hppa/hppa_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/include/mcontext.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [mrg-ohci-jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 22:04:56 UTC 2011

Modified Files:
src/sys/dev/usb [mrg-ohci-jmcneill-usbmp]: usb_subr.c usbdi.c
usbdivar.h

Log Message:
sync usb_subr.c and usbdivar.h with the branch entirely, and most of
usbdi.c as well.


To generate a diff of this commit:
cvs rdiff -u -r1.180.6.1.2.3 -r1.180.6.1.2.4 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.134.2.1.2.3 -r1.134.2.1.2.4 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.93.8.1.2.2 -r1.93.8.1.2.3 src/sys/dev/usb/usbdivar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/sys

2011-12-08 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Thu Dec  8 22:27:36 UTC 2011

Modified Files:
src/sys/sys: sdt.h

Log Message:
Uses uintptr_t and therefore needs stdint.h.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/sdt.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/x86/x86

2011-12-08 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Thu Dec  8 22:36:42 UTC 2011

Modified Files:
src/sys/arch/x86/x86: pmap.c

Log Message:
pmap_bootstrap: use tlbflushg(), not tlbflush(), since we use global pages.


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/x86/x86/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [jmcneill-usbmp] src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Dec  8 22:38:47 UTC 2011

Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: ohci.c usbdi.c usbdivar.h

Log Message:
make ohci mostly work again.


To generate a diff of this commit:
cvs rdiff -u -r1.218.6.6 -r1.218.6.7 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.134.2.3 -r1.134.2.4 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.93.8.2 -r1.93.8.3 src/sys/dev/usb/usbdivar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/net/npf

2011-12-08 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Thu Dec  8 23:36:57 UTC 2011

Modified Files:
src/sys/net/npf: npf_ruleset.c npf_state_tcp.c

Log Message:
- Explain the magic in npf_tcpfl2case().
- Use __unused instead of (void)cast; fix comment.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/net/npf/npf_ruleset.c
cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_state_tcp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [jmcneill-usbmp] src/sys/dev

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Dec  9 01:53:00 UTC 2011

Modified Files:
src/sys/dev/pci [jmcneill-usbmp]: ehci_pci.c ohci_pci.c uhci_pci.c
src/sys/dev/usb [jmcneill-usbmp]: ehci.c ohci.c uaudio.c uhci.c umidi.c
usb.c usb_subr.c usbdi.c usbdivar.h

Log Message:
- make pipe->close method take the thread lock

- convert usb_taskq to use mutex/cv

- convert needs_explore usage into a cv on the thread lock

- remove KERNEL_*LOCK from uaudio and umidi, since we're supposedly
  MPSAFE here now

- use IPL_SCHED instead of IPL_USB (aka biglocked) interrupts

- drop the audio thread lock when calling into usb when it may sleep,
  avoiding a deadlock between audiowrite and audioioctl.  this fixes
  mixerctl -a vs. playing hanging the system
  XXX probably need to check this in a bunch more places.


To generate a diff of this commit:
cvs rdiff -u -r1.53.6.1 -r1.53.6.2 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.53 -r1.53.8.1 src/sys/dev/pci/uhci_pci.c
cvs rdiff -u -r1.181.6.4 -r1.181.6.5 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.218.6.7 -r1.218.6.8 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.124 -r1.124.2.1 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.240.6.5 -r1.240.6.6 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.125.6.4 -r1.125.6.5 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.180.6.2 -r1.180.6.3 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.134.2.4 -r1.134.2.5 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.93.8.3 -r1.93.8.4 src/sys/dev/usb/usbdivar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/xen/xen

2011-12-08 Thread Cherry G. Mathew
Module Name:src
Committed By:   cherry
Date:   Fri Dec  9 03:58:12 UTC 2011

Modified Files:
src/sys/arch/xen/xen: xengnt.c

Log Message:
Use mutex(9) instead of spl(9). Add further locks around grant table access.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/xen/xen/xengnt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/usb

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Dec  9 05:03:19 UTC 2011

Modified Files:
src/sys/dev/usb: uaudio.c

Log Message:
from the usbmp branch:
- drop the thread lock when usbd might sleep on us.

this also makes mixerctl -s vs play work without usbmp.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/usb/uaudio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Dec  9 05:06:57 UTC 2011

Modified Files:
src/sys/dev: TODO.audiomp

Log Message:
update a little:  zaudio failure, uaudio/umidi success


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/TODO.audiomp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev

2011-12-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Dec  9 05:08:25 UTC 2011

Modified Files:
src/sys/dev: audio.c

Log Message:
drop the thread lock in a couple of error cases that were missing.


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/dev/audio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/etc

2011-12-08 Thread Thor Lancelot Simon
Module Name:src
Committed By:   tls
Date:   Fri Dec  9 06:50:36 UTC 2011

Modified Files:
src/etc/etc.amd64: boot.cfg
src/etc/etc.i386: boot.cfg

Log Message:
Use random seed file (saved entropy) from default location by default
in i386 and amd64 boot.cfg.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/etc/etc.amd64/boot.cfg
cvs rdiff -u -r1.2 -r1.3 src/etc/etc.i386/boot.cfg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.