Index: uspace/lib/libc/arch/arm32/include/fibril.h
===================================================================
--- uspace/lib/libc/arch/arm32/include/fibril.h	(revision cd7693052741154ea8729bf8efd228ebe4e2348c)
+++ uspace/lib/libc/arch/arm32/include/fibril.h	(revision 04c3a21f4ed0a01352f34b0f63daa534d7ea67de)
@@ -58,9 +58,11 @@
  *  @param ptls  Pointer to the TCB.
  */
-#define context_set(c, _pc, stack, size, ptls) 			\
-	(c)->pc = (sysarg_t) (_pc);				\
-	(c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; 	\
-        (c)->tls = ((sysarg_t)(ptls)) + sizeof(tcb_t) + ARM_TP_OFFSET;
-
+#define context_set(c, _pc, stack, size, ptls) \
+	do { \
+		(c)->pc = (sysarg_t) (_pc); \
+		(c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
+ 		(c)->tls = ((sysarg_t)(ptls)) + sizeof(tcb_t) + ARM_TP_OFFSET; \
+		(c)->fp = 0; \
+	} while (0)
 
 /** Fibril context. 
@@ -79,7 +81,7 @@
 	uint32_t r7;
 	uint32_t r8;
-	uint32_t tls;
+	uint32_t tls;	/* r9 */
 	uint32_t r10;
-	uint32_t r11;
+	uint32_t fp;	/* r11 */
 } context_t;