summaryrefslogtreecommitdiffstats
path: root/arch/sh/lib
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-30 08:34:26 +0100
committerPaul Mundt <lethal@linux-sh.org>2008-01-28 05:18:58 +0100
commit325df7f20467da07901c4f2b006d3457bba0adec (patch)
tree9a0f6f218af24af250b5e1437e1d311181e66bab /arch/sh/lib
parentsh: GUSA atomic rollback support. (diff)
downloadlinux-325df7f20467da07901c4f2b006d3457bba0adec.tar.xz
linux-325df7f20467da07901c4f2b006d3457bba0adec.zip
sh: Explicit alignment for PAGE_SIZE in copy/clear_page().
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/lib')
-rw-r--r--arch/sh/lib/clear_page.S2
-rw-r--r--arch/sh/lib/copy_page.S3
2 files changed, 4 insertions, 1 deletions
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