Module Name:	src
Committed By:	ad
Date:		Fri Nov 16 20:35:32 UTC 2007

Modified Files:
	src/sys/arch/amd64/amd64 [vmlocking]: spl.S
	src/sys/arch/i386/i386 [vmlocking]: spl.S

Log Message:
softintr_ret keeps the IPL raised until returning to doreti/splx in order
to avoid recursing. To keep the IPL raised it adjusts ci_mtx_oldspl before
dropping curlwp->l_mutex. That's not safe if the current CPU holds more than
one spin mutex, and can lead to "WARNING: SPL NOT LOWERED...". Fix it.


To generate a diff of this commit:
cvs rdiff -r1.6.6.4 -r1.6.6.5 src/sys/arch/amd64/amd64/spl.S
cvs rdiff -r1.15.6.8 -r1.15.6.9 src/sys/arch/i386/i386/spl.S

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