From owner-svn-src-stable-7@FreeBSD.ORG  Sat Nov  6 12:41:47 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D22591065679;
	Sat,  6 Nov 2010 12:41:47 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C025A8FC0A;
	Sat,  6 Nov 2010 12:41:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA6Cfl87031304;
	Sat, 6 Nov 2010 12:41:47 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA6Cflv9031302;
	Sat, 6 Nov 2010 12:41:47 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201011061241.oA6Cflv9031302@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Sat, 6 Nov 2010 12:41:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214874 - stable/7/sys/kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Nov 2010 12:41:47 -0000

Author: lstewart
Date: Sat Nov  6 12:41:47 2010
New Revision: 214874
URL: http://svn.freebsd.org/changeset/base/214874

Log:
  The kthread/kproc KPI differs between 7.x and 8.x+ and requires the use of
  kthread_exit() in order to get a wakeup delivered to the "struct proc *" which
  ALQ relies on.
  
  This is an intentional direct commit to the 7-STABLE branch.

Modified:
  stable/7/sys/kern/kern_alq.c

Modified: stable/7/sys/kern/kern_alq.c
==============================================================================
--- stable/7/sys/kern/kern_alq.c	Sat Nov  6 11:38:49 2010	(r214873)
+++ stable/7/sys/kern/kern_alq.c	Sat Nov  6 12:41:47 2010	(r214874)
@@ -220,7 +220,7 @@ ald_daemon(void)
 		ALD_LOCK();
 	}
 
-	kproc_exit(0);
+	kthread_exit(0);
 }
 
 static void