Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision ad211c849e7c6874c1c3f6ce9695684e0420bd95)
+++ kernel/generic/include/arch.h	(revision ffccdff0fd3f49751202889e457bdf900721bfad)
@@ -36,14 +36,21 @@
 #define KERN_ARCH_H_
 
-#include <arch/asm.h>   /* get_stack_base() */
 #include <config.h>
 
-/*
+/** Return the current_t structure
+ *
  * The current_t structure holds pointers to various parts of the current
  * execution state, like running task, thread, address space, etc.
+ *
+ * The current_t structure is located at the base address of the current
+ * stack. The stack is assumed to be STACK_SIZE bytes long. The stack base
+ * address must be aligned to STACK_SIZE.
+ *
  */
-#define CURRENT  ((current_t * )(get_stack_base()))
+#define CURRENT \
+	((current_t *) (((uintptr_t) __builtin_frame_address(0)) & \
+	    (~((uintptr_t) STACK_SIZE - 1))))
 
-#define MAGIC                UINT32_C(0xfacefeed)
+#define MAGIC  UINT32_C(0xfacefeed)
 
 #define container_check(ctn1, ctn2)  ((ctn1) == (ctn2))
@@ -59,16 +66,18 @@
 struct as;
 
-/**
+/** Current structure
+ *
  * For each possible kernel stack, structure
  * of the following type will be placed at
  * the base address of the stack.
+ *
  */
 typedef struct {
-	size_t preemption;     /**< Preemption disabled counter and flag. */
-	struct thread *thread; /**< Current thread. */
-	struct task *task;     /**< Current task. */
-	struct cpu *cpu;       /**< Executing cpu. */
-	struct as *as;         /**< Current address space. */
-	uint32_t magic;        /**< Magic value */
+	size_t preemption;      /**< Preemption disabled counter and flag. */
+	struct thread *thread;  /**< Current thread. */
+	struct task *task;      /**< Current task. */
+	struct cpu *cpu;        /**< Executing CPU. */
+	struct as *as;          /**< Current address space. */
+	uint32_t magic;         /**< Magic value. */
 } current_t;
 
@@ -89,5 +98,5 @@
 	} while (0)
 
-#define ARCH_OP(op)	ARCH_STRUCT_OP(arch_ops, op)
+#define ARCH_OP(op)  ARCH_STRUCT_OP(arch_ops, op)
 
 extern void current_initialize(current_t *);