Index: kernel/arch/abs32le/include/context.h
===================================================================
--- kernel/arch/abs32le/include/context.h	(revision d32358f46cafe03f9b3c769982c62f90757ba1c4)
+++ kernel/arch/abs32le/include/context.h	(revision a281fc8217c0fce5209fbd69b047d8a62040bb7a)
@@ -39,4 +39,7 @@
 #define SP_DELTA         0
 
+#define context_set(ctx, pc, stack, size) \
+    context_set_generic(ctx, pc, stack, size)
+
 /*
  * On real hardware this stores the registers which
Index: kernel/arch/ia64/include/context.h
===================================================================
--- kernel/arch/ia64/include/context.h	(revision d32358f46cafe03f9b3c769982c62f90757ba1c4)
+++ kernel/arch/ia64/include/context.h	(revision a281fc8217c0fce5209fbd69b047d8a62040bb7a)
@@ -48,8 +48,4 @@
  */
 #define SP_DELTA	(0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
-
-#ifdef context_set
-#undef context_set
-#endif
 
 /* RSE stack starts at the bottom of memory stack. */
Index: kernel/arch/mips32/include/context.h
===================================================================
--- kernel/arch/mips32/include/context.h	(revision d32358f46cafe03f9b3c769982c62f90757ba1c4)
+++ kernel/arch/mips32/include/context.h	(revision a281fc8217c0fce5209fbd69b047d8a62040bb7a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32	
+/** @addtogroup mips32
  * @{
  */
@@ -42,10 +42,12 @@
  * Put one item onto the stack to support get_stack_base() and align it up.
  */
-#define SP_DELTA	(0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
-
+#define SP_DELTA  (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
 #ifndef __ASM__
 
 #include <arch/types.h>
+
+#define context_set(ctx, pc, stack, size) \
+    context_set_generic(ctx, pc, stack, size)
 
 /*
Index: kernel/arch/ppc32/include/context.h
===================================================================
--- kernel/arch/ppc32/include/context.h	(revision d32358f46cafe03f9b3c769982c62f90757ba1c4)
+++ kernel/arch/ppc32/include/context.h	(revision a281fc8217c0fce5209fbd69b047d8a62040bb7a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32	
+/** @addtogroup ppc32
  * @{
  */
@@ -38,5 +38,8 @@
 #include <arch/types.h>
 
-#define SP_DELTA	16
+#define SP_DELTA  16
+
+#define context_set(ctx, pc, stack, size) \
+    context_set_generic(ctx, pc, stack, size)
 
 typedef struct {
@@ -68,5 +71,5 @@
 	
 	ipl_t ipl;
-} __attribute__ ((packed)) context_t;
+} __attribute__((packed)) context_t;
 
 #endif
Index: kernel/arch/sparc64/include/context.h
===================================================================
--- kernel/arch/sparc64/include/context.h	(revision d32358f46cafe03f9b3c769982c62f90757ba1c4)
+++ kernel/arch/sparc64/include/context.h	(revision a281fc8217c0fce5209fbd69b047d8a62040bb7a)
@@ -42,8 +42,4 @@
 #define SP_DELTA	(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
 
-#ifdef context_set
-#undef context_set
-#endif
-
 #define context_set(c, _pc, stack, size)			\
 	(c)->pc = ((uintptr_t) _pc) - 8;			\