From owner-svn-src-all@FreeBSD.ORG  Fri Oct 18 11:25:09 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 884515F8;
 Fri, 18 Oct 2013 11:25:09 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 75EA32799;
 Fri, 18 Oct 2013 11:25:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IBP936001446;
 Fri, 18 Oct 2013 11:25:09 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IBP9pk001443;
 Fri, 18 Oct 2013 11:25:09 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201310181125.r9IBP9pk001443@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 18 Oct 2013 11:25:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256729 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 11:25:09 -0000

Author: glebius
Date: Fri Oct 18 11:25:08 2013
New Revision: 256729
URL: http://svnweb.freebsd.org/changeset/base/256729

Log:
  Revert r256587.
  
  Requested by:	zec

Modified:
  head/sys/sys/_task.h
  head/sys/sys/taskqueue.h

Modified: head/sys/sys/_task.h
==============================================================================
--- head/sys/sys/_task.h	Fri Oct 18 09:50:23 2013	(r256728)
+++ head/sys/sys/_task.h	Fri Oct 18 11:25:08 2013	(r256729)
@@ -49,9 +49,6 @@ struct task {
 	u_short	ta_priority;		/* (c) Priority */
 	task_fn_t *ta_func;		/* (c) task handler */
 	void	*ta_context;		/* (c) argument for handler */
-#ifdef VIMAGE
-	struct vnet *ta_vnet;		/* (c) vnet context */
-#endif
 };
 
 #endif /* !_SYS__TASK_H_ */

Modified: head/sys/sys/taskqueue.h
==============================================================================
--- head/sys/sys/taskqueue.h	Fri Oct 18 09:50:23 2013	(r256728)
+++ head/sys/sys/taskqueue.h	Fri Oct 18 11:25:08 2013	(r256729)
@@ -36,9 +36,6 @@
 #include <sys/queue.h>
 #include <sys/_task.h>
 #include <sys/_callout.h>
-#ifdef VIMAGE
-#include <net/vnet.h>
-#endif
 
 struct taskqueue;
 struct thread;
@@ -108,22 +105,12 @@ void	taskqueue_thread_enqueue(void *cont
 /*
  * Initialise a task structure.
  */
-#ifdef VIMAGE
 #define TASK_INIT(task, priority, func, context) do {	\
 	(task)->ta_pending = 0;				\
 	(task)->ta_priority = (priority);		\
 	(task)->ta_func = (func);			\
 	(task)->ta_context = (context);			\
-	(task)->ta_vnet = curvnet;			\
 } while (0)
-#else	/* !VIMAGE */
-#define TASK_INIT(task, priority, func, context) do {	\
-	(task)->ta_pending = 0;				\
-	(task)->ta_priority = (priority);		\
-	(task)->ta_func = (func);			\
-	(task)->ta_context = (context);			\
-} while (0)
-#endif	/* !VIMAGE */
 
 void _timeout_task_init(struct taskqueue *queue,
 	    struct timeout_task *timeout_task, int priority, task_fn_t func,