Index: kernel/generic/include/context.h
===================================================================
--- kernel/generic/include/context.h	(revision 5608deba7eb0e64a3c351320a342d3e00f43eecb)
+++ kernel/generic/include/context.h	(revision 9dae3e9720388190f7e54eaf21f0ed91498f9d59)
@@ -41,6 +41,8 @@
 
 #define context_set_generic(ctx, _pc, stack, size) \
-	(ctx)->pc = (uintptr_t) (_pc); \
-	(ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA;
+	do { \
+		(ctx)->pc = (uintptr_t) (_pc); \
+		(ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
+	} while (0)
 
 extern int context_save_arch(context_t *ctx) __attribute__((returns_twice));
Index: uspace/lib/c/arch/ia32/include/fibril.h
===================================================================
--- uspace/lib/c/arch/ia32/include/fibril.h	(revision 5608deba7eb0e64a3c351320a342d3e00f43eecb)
+++ uspace/lib/c/arch/ia32/include/fibril.h	(revision 9dae3e9720388190f7e54eaf21f0ed91498f9d59)
@@ -38,5 +38,6 @@
 #include <sys/types.h>
 
-/* According to ABI the stack MUST be aligned on 
+/*
+ * According to ABI the stack MUST be aligned on
  * 16-byte boundary. If it is not, the va_arg calling will
  * panic sooner or later
Index: uspace/lib/c/include/fibril.h
===================================================================
--- uspace/lib/c/include/fibril.h	(revision 5608deba7eb0e64a3c351320a342d3e00f43eecb)
+++ uspace/lib/c/include/fibril.h	(revision 9dae3e9720388190f7e54eaf21f0ed91498f9d59)
@@ -41,7 +41,9 @@
 
 #define context_set_generic(c, _pc, stack, size, ptls) \
-	(c)->pc = (sysarg_t) (_pc); \
-	(c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
-	(c)->tls = (sysarg_t) (ptls);
+	do { \
+		(c)->pc = (sysarg_t) (_pc); \
+		(c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \
+		(c)->tls = (sysarg_t) (ptls); \
+	} while (0)
 
 #define FIBRIL_SERIALIZED  1