Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 669f3d321e8829b7e31263be9622012f870d9539)
+++ kernel/generic/include/proc/task.h	(revision 32d2e6032dc6c247786bec6676b5e3fdd853cca1)
@@ -129,12 +129,12 @@
 	task_arch_t arch;
 	
-	/** Serializes access to futex_list (independent of the task spinlock). */
-	mutex_t futex_list_lock;
-	/** List of all futexes accesses by this task. */
-	list_t futex_list;
-	/** CHT mapping virtual addresses of futex variables to futex objects. */
 	struct futex_cache {
+		/** CHT mapping virtual addresses of futex variables to futex objects.*/
+		cht_t ht;
+		/** Serializes access to futex_list.*/
+		mutex_t list_lock;
+		/** List of all futexes accesses by this task. */
+		list_t list;
 		work_t destroy_work;
-		cht_t ht;
 	} *futexes;