From ed3c8ba213c9e673fcefc646308f16d049b1a411 Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 18 Oct 2013 11:25:08 +0000
Subject: [PATCH] Revert r256587.

Requested by:	zec
---
 sys/sys/_task.h     |  3 ---
 sys/sys/taskqueue.h | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/sys/sys/_task.h b/sys/sys/_task.h
index 8ef0250d8d5..11fd1bc0d09 100644
--- a/sys/sys/_task.h
+++ b/sys/sys/_task.h
@@ -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_ */
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index ae38e99d53f..7836262b233 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -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 *context);
 /*
  * 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,