From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 30 Nov 2007 07:34:26 +0000 (+0900)
Subject: sh: Explicit alignment for PAGE_SIZE in copy/clear_page().
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=325df7f20467da07901c4f2b006d3457bba0adec;p=linux-beck.git

sh: Explicit alignment for PAGE_SIZE in copy/clear_page().

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/lib/clear_page.S b/arch/sh/lib/clear_page.S
index 36d44ef2b8a2..3539123fe517 100644
--- a/arch/sh/lib/clear_page.S
+++ b/arch/sh/lib/clear_page.S
@@ -50,6 +50,8 @@ ENTRY(clear_page)
 	!
 	rts
 	 nop
+
+	.balign 4
 .Llimit:	.long	(PAGE_SIZE-28)
 
 ENTRY(__clear_user)
diff --git a/arch/sh/lib/copy_page.S b/arch/sh/lib/copy_page.S
index b879545fa28b..e002b91c8752 100644
--- a/arch/sh/lib/copy_page.S
+++ b/arch/sh/lib/copy_page.S
@@ -68,8 +68,9 @@ ENTRY(copy_page)
 	rts
 	 nop
 
-	.align 2
+	.balign 4
 .Lpsz:	.long	PAGE_SIZE
+
 /*
  * __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
  * Return the number of bytes NOT copied