Index: arch/mips32/include/context.h
===================================================================
--- arch/mips32/include/context.h	(revision 46579c668e7949ef922a5e481b7b114d89e019b3)
+++ arch/mips32/include/context.h	(revision 37c57f29513b54c8a95f330fce386b8a26dffa7e)
@@ -30,10 +30,11 @@
 #define __mips32_CONTEXT_H__
 
-#define STACK_ITEM_SIZE	4
+#include <align.h>
+#include <arch/stack.h>
 
 /*
- * Put one item onto the stack to support get_stack_base() and align it up to 8 bytes boundary.
+ * Put one item onto the stack to support get_stack_base() and align it up.
  */
-#define SP_DELTA	((0 + STACK_ITEM_SIZE + 7) & (~7))
+#define SP_DELTA	(0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
 
Index: arch/mips32/include/stack.h
===================================================================
--- arch/mips32/include/stack.h	(revision 37c57f29513b54c8a95f330fce386b8a26dffa7e)
+++ arch/mips32/include/stack.h	(revision 37c57f29513b54c8a95f330fce386b8a26dffa7e)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __mips32_STACK_H__
+#define __mips32_STACK_H__
+
+#define STACK_ITEM_SIZE		4
+#define STACK_ALIGNMENT		8
+
+#endif