Index: arch/ia32/src/mm/frame.c
===================================================================
--- arch/ia32/src/mm/frame.c	(revision 05e2a7ad64a4c5a40748a558c64ca76a66934a0c)
+++ arch/ia32/src/mm/frame.c	(revision f62355aea23212db577071da8a3579c9972c1a06)
@@ -58,6 +58,6 @@
 			if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
 				zone_create_in_region(e820table[i].base_address, e820table[i].size & ~(FRAME_SIZE-1));
-				if (last_frame < ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
-					last_frame = ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
+				if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
+					last_frame = ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
 			}			
 		}
Index: arch/ia64/include/context.h
===================================================================
--- arch/ia64/include/context.h	(revision 05e2a7ad64a4c5a40748a558c64ca76a66934a0c)
+++ arch/ia64/include/context.h	(revision f62355aea23212db577071da8a3579c9972c1a06)
@@ -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;
 
 /*
Index: arch/sparc64/include/context.h
===================================================================
--- arch/sparc64/include/context.h	(revision 05e2a7ad64a4c5a40748a558c64ca76a66934a0c)
+++ arch/sparc64/include/context.h	(revision f62355aea23212db577071da8a3579c9972c1a06)
@@ -31,5 +31,5 @@
 
 #ifndef __sparc64_STACK_H__
-#include <arch/stack.h>
+# include <arch/stack.h>
 #endif
 
@@ -50,5 +50,5 @@
 #define context_set(c, _pc, stack, size)								\
         (c)->pc = ((__address) _pc) - 8;								\
-        (c)->sp = ((__address) stack) + ALIGN((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
+        (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
 	(c)->fp = -STACK_BIAS