PERFORCE change 134103 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=134103

Change 134103 by rwatson at rwatson_freebsd_capabilities on 2008/01/25 21:37:21

	Integrate more sleepqueue fixes into TrustedBSD capabilities
	branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_sleepqueue.c#3 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_sleepqueue.c#3 (text+ko) ====

@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.42 2008/01/25 02:09:38 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.43 2008/01/25 19:44:46 jhb Exp $");
 
 #include "opt_sleepqueue_profiling.h"
 #include "opt_ddb.h"
@@ -817,8 +817,7 @@
 	 * sleepq_catch_signals().
 	 */
 	if (TD_ON_SLEEPQ(td)) {
-		td->td_flags |= TDF_TIMEOUT | TDF_INTERRUPT;
-		td->td_intrval = EWOULDBLOCK;
+		td->td_flags |= TDF_TIMEOUT;
 		thread_unlock(td);
 		return;
 	}