diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-30 02:34:26 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:58 -0500 |
commit | 325df7f20467da07901c4f2b006d3457bba0adec (patch) | |
tree | 9a0f6f218af24af250b5e1437e1d311181e66bab | |
parent | 1efe4ce3ca126da77e450d5a83f7201949d76f62 (diff) |
sh: Explicit alignment for PAGE_SIZE in copy/clear_page().
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/lib/clear_page.S | 2 | ||||
-rw-r--r-- | arch/sh/lib/copy_page.S | 3 |
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) | |||
50 | ! | 50 | ! |
51 | rts | 51 | rts |
52 | nop | 52 | nop |
53 | |||
54 | .balign 4 | ||
53 | .Llimit: .long (PAGE_SIZE-28) | 55 | .Llimit: .long (PAGE_SIZE-28) |
54 | 56 | ||
55 | ENTRY(__clear_user) | 57 | 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) | |||
68 | rts | 68 | rts |
69 | nop | 69 | nop |
70 | 70 | ||
71 | .align 2 | 71 | .balign 4 |
72 | .Lpsz: .long PAGE_SIZE | 72 | .Lpsz: .long PAGE_SIZE |
73 | |||
73 | /* | 74 | /* |
74 | * __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n); | 75 | * __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n); |
75 | * Return the number of bytes NOT copied | 76 | * Return the number of bytes NOT copied |