Mutex errors after vmlocking2 merge?

I get the following panics on sun3 (tme) and sun3x (3/80):

sun3x:
---
Mutex error: mutex_vector_enter: locking against myself

lock address : 0x00000000f96a7838
current cpu  :                  0
current lwp  : 0x00000000fa5596a0
owner field  : 0x00000000fa5596a0 wait/spin:                0/0

panic: lock error
Stopped in pid 184.1 (amd) at   netbsd:cpu_Debugger+0x6:        unlk    a6
db> tr
cpu_Debugger(f96a7838,0,f810b930,fa66fbb0,fa66fbbc) + 6
panic(f81d0cd5,fa5596a0,f96a7838,f8404a00,fa66fbd4) + 11a
lockdebug_abort(f96a7838,f81e4cac,f81cf02b,f81cebe8) + 4c
mutex_abort(f96a7838,f81cf02b,f81cebe8,a000,0) + 28
mutex_vector_enter(?)
mutex_enter(f96a7838) + da
biodone2(f8391d88) + 24
biodone(f8391d88) + 52
sddone(f838bcd4,0) + 72
scsipi_complete(f838bcd4) + 122
scsipi_done(f838bcd4) + 150
ncr53c9x_done(f83f3400,f8389ed8) + ba
ncr53c9x_intr(f83f3400) + 6c6
isr_autovec(2408,173,f82e6000,f825cdcc,2008f817) + 44
m68k_compat_13_sigreturn13_stub(?)
pmap_copy_page(351a000,350c000) + 68
uvm_pagecopy(f833d260,f833d0d8) + 1a
uvmfault_promote(fa66fe5c,0,f833d260,fa66fe84,fa66fe7c) + 72
uvm_fault_internal(f969d930,803c000,5,2) + 91c
uvm_fault_wire(f969d930,801e000,8042000,7,1) + 3c
uvm_map_pageable_all(f969d930,3,1410000) + 1ae
sys_mlockall(fa5596a0,fa66ff38,fa66ff78) + 2c
syscall_plain(f2,fa5596a0,fa66ffb4) + bc
syscall(f2) + 62
fmterr() + 192
db> 


---

sun3: (typed from screen)
---
Mutex error: mutex_vector_enter: locking against myself

lock address : 0x000000000e2026c0
current cpu  :                  0
current lwp  : 0x000000000e1db520
owner field  : 0x000000000e1db520 wait/spin:                0/0

panic: lock error
Stopped in pid 0.1 (system) at	netbsd:cpu_Debugger+0x6:	unlk	a6
db> tr
cpu_Debugger(e2026c0,0,e0fe480,e255d28,e255d34) + 6
panic(e1c6ca5,e1db520,e2026c0,e379400,e255d4c) + 11a
lockdebug_abort(e2026c0,e1db1e4,e1c4ffb,e1c4bb8) + 4c
mutex_abort(e2026c0,e1c4ffb,e1c4bb8,200,0) + 28
mutex_vector_enter(?)
mutex_enter(e2026c0) + da
biodone2(e309ed8) + 24
biodone(e309ed8) + 52
sddone(e305ec0,0) + 72
scsipi_complete(e305ec0) + 122
scsipi_done(e305ec0) + 150
ncr5380_done(e357800) + b2
ncr5380_machine(e357800) + 15a
ncr5380_intr(e357800) + 44
si_intr(e357800) + 60
isr_vectored(1f,1f,e2026c0,e357800,20100e0d) + 3a
m68k_compat_13_sigreturn13_stub(e309f6c,e2026c0) + 8e
biowait(e309ed8) + 34
readdisklabel(2,e186204,e379200,e379000) + 6a
sdopen(701,0,6000,0) + 31a
sdsize(701) + ac
cpu_dumpconf(2000000,0,0,dfffffc,20) + 2e
main(0,0,0,0,0) + 282
db>
---

It looks splbio is not blocked but I'm afraid
I missed something on recent new softint changes for sun3.

Any ideas?
---
Izumi Tsutsui