Vchan hard locks, and soft volume patch module compile errors

[Mike S.]

I had this patch running before, snd_RELENG_5_20050916_043softvol.diff
Now that I have updated to the current one, did a make world.  The new patch no longer works, I get this error when I try to compile modules.

/usr/src/sys/modules/sound/sound/../../../dev/sound/pcm/sndstat.c: In function `sndstat_uninit':
/usr/src/sys/modules/sound/sound/../../../dev/sound/pcm/sndstat.c:364: error: `s' undeclared (first use in this function)
/usr/src/sys/modules/sound/sound/../../../dev/sound/pcm/sndstat.c:364: error: (Each undeclared identifier is reported only once
/usr/src/sys/modules/sound/sound/../../../dev/sound/pcm/sndstat.c:364: error: for each function it appears in.)
/usr/src/sys/modules/sound/sound/../../../dev/sound/pcm/sndstat.c: At top level:
/usr/src/sys/modules/sound/sound/../../../dev/sound/pcm/sndstat.c:372: warning: no previous prototype for 'sndstat_busy'
*** Error code 1

Stop in /usr/src/sys/modules/sound/sound.
*** Error code 1

Stop in /usr/src/sys/modules/sound.

sndstat: 
FreeBSD Audio Driver (newpcm)
Installed devices:
pcm0: <VIA VT8237> at io 0xc400 irq 22 kld snd_via8233 (5p/1r/10v channels duplex default)

pciconf -lv:

pcm0 at pci0:17:5: class=0x040100 card=0x00801462 chip=0x30591106 rev=0x60 hdr=0x00
    vendor   = 'VIA Technologies Inc'
    device   = 'VT8233/33A/8235/8237 AC97 Enhanced Audio Controller'
    class    = multimedia
    subclass = audio

dmesg: 

Copyright (c) 1992-2005 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
        The Regents of the University of California. All rights reserved.
FreeBSD 5.4-STABLE #6: Tue Sep 27 06:13:37 CDT 2005
    perlfu at insomnia.localnet.net:/usr/obj/usr/src/sys/INSOMNIA
Timecounter "i8254" frequency 1193182 Hz quality 0
CPU: AMD Athlon(tm) 64 Processor 3400+ (2400.11-MHz K8-class CPU)
  Origin = "AuthenticAMD"  Id = 0xfc0  Stepping = 0
  Features=0x78bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2>
  AMD Features=0xe0500800<SYSCALL,NX,MMX+,LM,3DNow+,3DNow>
real memory  = 2147418112 (2047 MB)
avail memory = 2062835712 (1967 MB)
ACPI APIC Table: <AMIINT VIA_K8  >
ioapic0 <Version 0.3> irqs 0-23 on motherboard
acpi0: <AMIINT VIA_K8> on motherboard
acpi0: Power Button (fixed)
Timecounter "ACPI-fast" frequency 3579545 Hz quality 1000
acpi_timer0: <24-bit timer at 3.579545MHz> port 0x808-0x80b on acpi0
cpu0: <ACPI CPU> on acpi0
acpi_throttle0: <ACPI CPU Throttling> on cpu0
acpi_button0: <Power Button> on acpi0
pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
pci0: <ACPI PCI bus> on pcib0
agp0: <VIA 8380 host to PCI bridge> mem 0xd0000000-0xd7ffffff at device 0.0 on pci0
pcib1: <PCI-PCI bridge> at device 1.0 on pci0
pci1: <PCI bus> on pcib1
pci1: <display, VGA> at device 0.0 (no driver attached)
pci1: <display> at device 0.1 (no driver attached)
atapci0: <VIA 6420 SATA150 controller> port 0xd800-0xd8ff,0xdc00-0xdc0f,0xe000-0xe003,0xe400-0xe407,0xe800-0xe803,0xec00-0xec07 irq 20 at device 15.0 on pci0
ata2: channel #0 on atapci0
ata3: channel #1 on atapci0
atapci1: <VIA 8237 UDMA133 controller> port 0xfc00-0xfc0f,0x376,0x170-0x177,0x3f6,0x1f0-0x1f7 at device 15.1 on pci0
ata0: channel #0 on atapci1
ata1: channel #1 on atapci1
uhci0: <VIA 83C572 USB controller> port 0xc800-0xc81f irq 21 at device 16.0 on pci0
usb0: <VIA 83C572 USB controller> on uhci0
usb0: USB revision 1.0
uhub0: VIA UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub0: 2 ports with 2 removable, self powered
uhci1: <VIA 83C572 USB controller> port 0xcc00-0xcc1f irq 21 at device 16.1 on pci0
usb1: <VIA 83C572 USB controller> on uhci1
usb1: USB revision 1.0
uhub1: VIA UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub1: 2 ports with 2 removable, self powered
uhci2: <VIA 83C572 USB controller> port 0xd000-0xd01f irq 21 at device 16.2 on pci0
usb2: <VIA 83C572 USB controller> on uhci2
usb2: USB revision 1.0
uhub2: VIA UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub2: 2 ports with 2 removable, self powered
uhub3: VIA UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub3: 2 ports with 2 removable, self powered
ehci0: <VIA VT6202 USB 2.0 controller> mem 0xcfffbe00-0xcfffbeff irq 21 at device 16.4 on pci0
usb4: EHCI version 1.0
usb4: companion controllers, 2 ports each: usb0 usb1 usb2 usb3
usb4: <VIA VT6202 USB 2.0 controller> on ehci0
usb4: USB revision 2.0
uhub4: VIA EHCI root hub, class 9/0, rev 2.00/1.00, addr 1
uhub4: 8 ports with 8 removable, self powered
isab0: <PCI-ISA bridge> at device 17.0 on pci0
isa0: <ISA bus> on isab0
pcm0: <VIA VT8237> port 0xc400-0xc4ff irq 22 at device 17.5 on pci0
pcm0: <Avance Logic ALC655 AC97 Codec>
vr0: <VIA VT6102 Rhine II 10/100BaseTX> port 0xc000-0xc0ff mem 0xcfffbd00-0xcfffbdff irq 23 at device 18.0 on pci0
miibus0: <MII bus> on vr0
rlphy0: <RTL8201L 10/100 media interface> on miibus0
rlphy0:  10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
vr0: Ethernet address: 00:11:09:cc:d1:83
fdc0: <floppy drive controller> port 0x3f7,0x3f4-0x3f5,0x3f2-0x3f3 irq 6 drq 2 on acpi0
fd0: <1440-KB 3.5" drive> on fdc0 drive 0
sio0: configured irq 4 not in bitmap of probed irqs 0
sio0: port may not be enabled
sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
sio0: type 16550A
ppc0: <ECP parallel printer port> port 0x778-0x77b,0x378-0x37f irq 7 drq 3 on acpi0
ppc0: SMC-like chipset (ECP/EPP/PS2/NIBBLE) in COMPATIBLE mode
ppc0: FIFO with 16/16/9 bytes threshold
ppbus0: <Parallel port bus> on ppc0
plip0: <PLIP network interface> on ppbus0
lpt0: <Printer> on ppbus0
lpt0: Interrupt-driven port
ppi0: <Parallel I/O> on ppbus0
atkbdc0: <Keyboard controller (i8042)> port 0x64,0x60 irq 1 on acpi0
atkbd0: <AT Keyboard> flags 0x1 irq 1 on atkbdc0
kbd0 at atkbd0
psm0: <PS/2 Mouse> irq 12 on atkbdc0
psm0: model MouseMan+, device ID 0
orm0: <ISA Option ROMs> at iomem 0xe0000-0xe0fff,0xd2000-0xd47ff,0xc0000-0xccfff on isa0
sc0: <System console> at flags 0x100 on isa0
sc0: VGA <16 virtual consoles, flags=0x300>
sio1: configured irq 3 not in bitmap of probed irqs 0
sio1: port may not be enabled
vga0: <Generic ISA VGA> at port 0x3c0-0x3df iomem 0xa0000-0xbffff on isa0
Timecounter "TSC" frequency 2400108632 Hz quality 800
Timecounters tick every 1.000 msec
acd0: DVDR <PIONEER DVD-RW DVR-108/1.10> at ata0-master PIO4
acd1: DVDR <PIONEER DVD-RW DVR-107D/1.10> at ata1-slave PIO4
ad4: 76293MB <WDC WD800JD-75JNA0/05.01C05> [155009/16/63] at ata2-master SATA150
cd0 at ata0 bus 0 target 0 lun 0
cd0: <PIONEER DVD-RW  DVR-108 1.10> Removable CD-ROM SCSI-0 device 
cd0: 16.000MB/s transfers
cd0: Attempt to query device size failed: NOT READY, Medium not present
cd1 at ata1 bus 0 target 1 lun 0
cd1: <PIONEER DVD-RW  DVR-107D 1.10> Removable CD-ROM SCSI-0 device 
cd1: 16.000MB/s transfers
cd1: cd present [329821 x 2048 byte records]

uname -a:
FreeBSD insomnia.localnet.net 5.4-STABLE FreeBSD 5.4-STABLE #6: Tue Sep 27 06:13:37 CDT 2005     perlfu at insomnia.localnet.net:/usr/obj/usr/src/sys/INSOMNIA  amd64