svn commit: r256729 - head/sys/sys

[Gleb Smirnoff]

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,