Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision eb239dc81f44cabbda761a1c5ed77357bd72652e)
+++ kernel/generic/include/arch.h	(revision d8af1bd5a77474fa3083a3477a2cd6f6567603c3)
@@ -41,5 +41,11 @@
 #include <mm/as.h>
 
-#define DEFAULT_CONTEXT  0
+/*
+ * THE is not an abbreviation, but the English definite article written in
+ * capital letters. It means the current pointer to something, e.g. thread,
+ * processor or address space. Kind reader of this comment shall appreciate
+ * the wit of constructs like THE->thread and similar.
+ */
+#define THE  ((the_t * )(get_stack_base()))
 
 #define CPU                  THE->cpu
@@ -47,8 +53,12 @@
 #define TASK                 THE->task
 #define AS                   THE->as
-#define CONTEXT              (THE->task ? THE->task->context : DEFAULT_CONTEXT)
 #define PREEMPTION_DISABLED  THE->preemption_disabled
+#define MAGIC                UINT32_C(0xfacefeed)
 
-#define context_check(ctx1, ctx2)  ((ctx1) == (ctx2))
+#define container_check(ctn1, ctn2)  ((ctn1) == (ctn2))
+
+#define DEFAULT_CONTAINER  0
+#define CONTAINER \
+	((THE->task) ? (THE->task->container) : (DEFAULT_CONTAINER))
 
 /**
@@ -63,13 +73,6 @@
 	cpu_t *cpu;                  /**< Executing cpu. */
 	as_t *as;                    /**< Current address space. */
+	uint32_t magic;              /**< Magic value */
 } the_t;
-
-/*
- * THE is not an abbreviation, but the English definite article written in
- * capital letters. It means the current pointer to something, e.g. thread,
- * processor or address space. Kind reader of this comment shall appreciate
- * the wit of constructs like THE->thread and similar.
- */
-#define THE  ((the_t * )(get_stack_base()))
 
 extern void the_initialize(the_t *);