Index: kernel/arch/ia64/include/context.h
===================================================================
--- kernel/arch/ia64/include/context.h	(revision 82474ef569903ac99835ea373081f03a5195c413)
+++ 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. */