From owner-svn-src-head@FreeBSD.ORG  Mon Dec  1 01:54:55 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B355E1065678;
	Mon,  1 Dec 2008 01:54:55 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A43E38FC1A;
	Mon,  1 Dec 2008 01:54:55 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB11stVJ008617;
	Mon, 1 Dec 2008 01:54:55 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB11stAX008616;
	Mon, 1 Dec 2008 01:54:55 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <200812010154.mB11stAX008616@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Mon, 1 Dec 2008 01:54:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185502 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Dec 2008 01:54:55 -0000

Author: davidxu
Date: Mon Dec  1 01:54:55 2008
New Revision: 185502
URL: http://svn.freebsd.org/changeset/base/185502

Log:
  Revision 184199 had not been fully reverted, add missing piece.
  
  Reported by: phk

Modified:
  head/sys/kern/subr_sleepqueue.c

Modified: head/sys/kern/subr_sleepqueue.c
==============================================================================
--- head/sys/kern/subr_sleepqueue.c	Mon Dec  1 01:45:52 2008	(r185501)
+++ head/sys/kern/subr_sleepqueue.c	Mon Dec  1 01:54:55 2008	(r185502)
@@ -424,6 +424,10 @@ sleepq_catch_signals(void *wchan, int pr
 	PROC_UNLOCK(p);
 	thread_lock(td);
 	PROC_SUNLOCK(p);
+	if (ret == 0) {
+		sleepq_switch(wchan, pri);
+		return (0);
+	}
 	/*
 	 * There were pending signals and this thread is still
 	 * on the sleep queue, remove it from the sleep queue.