Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision bed67f2ae97127b56bd5c4ed93eb9badf151bb8e)
+++ kernel/generic/include/proc/task.h	(revision 947ab77e1138e5b43ed8d4e74ae82a491381bfec)
@@ -130,13 +130,8 @@
 	task_arch_t arch;
 
-	struct futex_cache {
-		/** CHT mapping virtual addresses of futex variables to futex objects.*/
-		cht_t ht;
-		/** Serializes access to futex_list.*/
-		SPINLOCK_DECLARE(list_lock);
-		/** List of all futexes accesses by this task. */
-		list_t list;
-		work_t destroy_work;
-	} *futexes;
+	/** Serializes access to futex_list.*/
+	SPINLOCK_DECLARE(futex_list_lock);
+	/** List of all futexes accesses by this task. */
+	list_t futex_list;
 
 	/** Accumulated accounting. */
Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision bed67f2ae97127b56bd5c4ed93eb9badf151bb8e)
+++ kernel/generic/include/synch/futex.h	(revision 947ab77e1138e5b43ed8d4e74ae82a491381bfec)
@@ -58,5 +58,4 @@
 extern void futex_task_cleanup(void);
 extern void futex_task_init(struct task *);
-extern void futex_task_deinit(struct task *);
 
 #endif