Index: arch/ia64/include/context.h
===================================================================
--- arch/ia64/include/context.h	(revision eef75f671c5a16e1de01ece7fb216c921e210d41)
+++ arch/ia64/include/context.h	(revision 9d5e23cc7bc9f1f8f9799b82cd567c045c657dd3)
@@ -41,5 +41,5 @@
  * One item is put onto the stack to support get_stack_base().
  */
-#define SP_DELTA	(0+ALIGN(STACK_ITEM_SIZE, STACK_ALIGNMENT))
+#define SP_DELTA	(0+ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
 #define PFM_MASK	(~0x3fffffffff)
@@ -51,7 +51,7 @@
 #define context_set(c, _pc, stack, size) 								\
 	(c)->pc = (__address) _pc;									\
-	(c)->bsp = ((__address) stack) + ALIGN(sizeof(the_t), REGISTER_STACK_ALIGNMENT);		\
+	(c)->bsp = ((__address) stack) + ALIGN_UP(sizeof(the_t), REGISTER_STACK_ALIGNMENT);		\
 	(c)->ar_pfs &= PFM_MASK; 									\
-	(c)->sp = ((__address) stack) + ALIGN((size), STACK_ALIGNMENT) - SP_DELTA;
+	(c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;
 
 /*