Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/proc/task.h	(revision d1da1ff2de1cccc51856404f676142f7deb1cf54)
@@ -63,5 +63,5 @@
 #include <cap/cap.h>
 
-#define TASK                 THE->task
+#define TASK                 CURRENT->task
 
 struct thread;
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/proc/thread.h	(revision d1da1ff2de1cccc51856404f676142f7deb1cf54)
@@ -52,5 +52,5 @@
 #include <arch.h>
 
-#define THREAD              THE->thread
+#define THREAD              CURRENT->thread
 
 #define THREAD_NAME_BUFLEN  20